Use built in CMaps and unify the glyph mapping.
This commit is contained in:
Brendan Dahl
parent
7be2d6db58
commit
b5b94a4af3
5
make.js
5
make.js
@ -105,6 +105,7 @@ target.generic = function() {
|
||||
copy: [
|
||||
[COMMON_WEB_FILES, GENERIC_DIR + '/web'],
|
||||
['external/webL10n/l10n.js', GENERIC_DIR + '/web'],
|
||||
['external/cmaps/', GENERIC_DIR + '/web/cmaps'],
|
||||
['web/viewer.css', GENERIC_DIR + '/web'],
|
||||
['web/compatibility.js', GENERIC_DIR + '/web'],
|
||||
['web/compressed.tracemonkey-pldi-09.pdf', GENERIC_DIR + '/web'],
|
||||
@ -489,6 +490,7 @@ target.firefox = function() {
|
||||
defines: defines,
|
||||
copy: [
|
||||
[COMMON_WEB_FILES, FIREFOX_BUILD_CONTENT_DIR + '/web'],
|
||||
['external/cmaps/', FIREFOX_BUILD_CONTENT_DIR + '/web/cmaps'],
|
||||
[FIREFOX_EXTENSION_DIR + 'tools/l10n.js',
|
||||
FIREFOX_BUILD_CONTENT_DIR + '/web'],
|
||||
['web/default_preferences.js', FIREFOX_BUILD_CONTENT_DIR]
|
||||
@ -604,6 +606,7 @@ target.mozcentral = function() {
|
||||
defines: defines,
|
||||
copy: [
|
||||
[COMMON_WEB_FILES, MOZCENTRAL_CONTENT_DIR + '/web'],
|
||||
['external/cmaps/', MOZCENTRAL_CONTENT_DIR + '/web/cmaps'],
|
||||
['extensions/firefox/tools/l10n.js', MOZCENTRAL_CONTENT_DIR + '/web'],
|
||||
['web/default_preferences.js', MOZCENTRAL_CONTENT_DIR]
|
||||
],
|
||||
@ -673,6 +676,7 @@ target.b2g = function() {
|
||||
var setup = {
|
||||
defines: defines,
|
||||
copy: [
|
||||
['external/cmaps/', B2G_BUILD_CONTENT_DIR + '/web/cmaps'],
|
||||
['extensions/b2g/images', B2G_BUILD_CONTENT_DIR + '/web'],
|
||||
['extensions/b2g/viewer.html', B2G_BUILD_CONTENT_DIR + '/web'],
|
||||
['extensions/b2g/viewer.css', B2G_BUILD_CONTENT_DIR + '/web'],
|
||||
@ -713,6 +717,7 @@ target.chromium = function() {
|
||||
var setup = {
|
||||
defines: defines,
|
||||
copy: [
|
||||
['external/cmaps/', CHROME_BUILD_CONTENT_DIR + '/web/cmaps'],
|
||||
[COMMON_WEB_FILES, CHROME_BUILD_CONTENT_DIR + '/web'],
|
||||
[['extensions/chromium/*.json',
|
||||
'extensions/chromium/*.html',
|
||||
|
||||
437
src/core/cmap.js
437
src/core/cmap.js
@ -15,184 +15,199 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
/* globals Util, isString, isInt, warn, error, isCmd, isEOF, isName, Lexer,
|
||||
isStream */
|
||||
isStream, StringStream */
|
||||
|
||||
'use strict';
|
||||
|
||||
var CMAP_CODESPACES = {
|
||||
'Adobe-CNS1-0': [[], [0, 14335]],
|
||||
'Adobe-CNS1-1': [[], [0, 17407]],
|
||||
'Adobe-CNS1-2': [[], [0, 17663]],
|
||||
'Adobe-CNS1-3': [[], [0, 18943]],
|
||||
'Adobe-CNS1-4': [[], [0, 19199]],
|
||||
'Adobe-CNS1-5': [[], [0, 19199]],
|
||||
'Adobe-CNS1-6': [[], [0, 19199]],
|
||||
'Adobe-CNS1-UCS2': [[], [0, 65535]],
|
||||
'B5-H': [[0, 128], [41280, 65278]],
|
||||
'B5-V': [[0, 128], [41280, 65278]],
|
||||
'B5pc-H': [[0, 128, 253, 255], [41280, 64766]],
|
||||
'B5pc-V': [[0, 128, 253, 255], [41280, 64766]],
|
||||
'CNS-EUC-H': [[0, 128], [41377, 65278], [],
|
||||
[2392957345, 2392981246, 2393022881, 2393046782, 2393088417, 2393112318]],
|
||||
'CNS-EUC-V': [[0, 128], [41377, 65278], [],
|
||||
[2392957345, 2392981246, 2393022881, 2393046782, 2393088417, 2393112318]],
|
||||
'CNS1-H': [[], [8481, 32382]],
|
||||
'CNS1-V': [[], [8481, 32382]],
|
||||
'CNS2-H': [[], [8481, 32382]],
|
||||
'CNS2-V': [[], [8481, 32382]],
|
||||
'ETen-B5-H': [[0, 128], [41280, 65278]],
|
||||
'ETen-B5-V': [[0, 128], [41280, 65278]],
|
||||
'ETenms-B5-H': [[0, 128], [41280, 65278]],
|
||||
'ETenms-B5-V': [[0, 128], [41280, 65278]],
|
||||
'ETHK-B5-H': [[0, 128], [34624, 65278]],
|
||||
'ETHK-B5-V': [[0, 128], [34624, 65278]],
|
||||
'HKdla-B5-H': [[0, 128], [41280, 65278]],
|
||||
'HKdla-B5-V': [[0, 128], [41280, 65278]],
|
||||
'HKdlb-B5-H': [[0, 128], [36416, 65278]],
|
||||
'HKdlb-B5-V': [[0, 128], [36416, 65278]],
|
||||
'HKgccs-B5-H': [[0, 128], [35392, 65278]],
|
||||
'HKgccs-B5-V': [[0, 128], [35392, 65278]],
|
||||
'HKm314-B5-H': [[0, 128], [41280, 65278]],
|
||||
'HKm314-B5-V': [[0, 128], [41280, 65278]],
|
||||
'HKm471-B5-H': [[0, 128], [41280, 65278]],
|
||||
'HKm471-B5-V': [[0, 128], [41280, 65278]],
|
||||
'HKscs-B5-H': [[0, 128], [34624, 65278]],
|
||||
'HKscs-B5-V': [[0, 128], [34624, 65278]],
|
||||
'UniCNS-UCS2-H': [[], [0, 55295, 57344, 65535]],
|
||||
'UniCNS-UCS2-V': [[], [0, 55295, 57344, 65535]],
|
||||
'UniCNS-UTF16-H': [[], [0, 55295, 57344, 65535], [],
|
||||
[3623934976, 3690979327]],
|
||||
'UniCNS-UTF16-V': [[], [0, 55295, 57344, 65535], [],
|
||||
[3623934976, 3690979327]],
|
||||
'Adobe-GB1-0': [[], [0, 7935]],
|
||||
'Adobe-GB1-1': [[], [0, 9983]],
|
||||
'Adobe-GB1-2': [[], [0, 22271]],
|
||||
'Adobe-GB1-3': [[], [0, 22527]],
|
||||
'Adobe-GB1-4': [[], [0, 29183]],
|
||||
'Adobe-GB1-5': [[], [0, 30463]],
|
||||
'Adobe-GB1-UCS2': [[], [0, 65535]],
|
||||
'GB-EUC-H': [[0, 128], [41377, 65278]],
|
||||
'GB-EUC-V': [[0, 128], [41377, 65278]],
|
||||
'GB-H': [[], [8481, 32382]],
|
||||
'GB-V': [[], [8481, 32382]],
|
||||
'GBK-EUC-H': [[0, 128], [33088, 65278]],
|
||||
'GBK-EUC-V': [[0, 128], [33088, 65278]],
|
||||
'GBK2K-H': [[0, 127], [33088, 65278], [], [2167439664, 4265213497]],
|
||||
'GBK2K-V': [[0, 127], [33088, 65278], [], [2167439664, 4265213497]],
|
||||
'GBKp-EUC-H': [[0, 128], [33088, 65278]],
|
||||
'GBKp-EUC-V': [[0, 128], [33088, 65278]],
|
||||
'GBpc-EUC-H': [[0, 128, 253, 255], [41377, 64766]],
|
||||
'GBpc-EUC-V': [[0, 128, 253, 255], [41377, 64766]],
|
||||
'GBT-EUC-H': [[0, 128], [41377, 65278]],
|
||||
'GBT-EUC-V': [[0, 128], [41377, 65278]],
|
||||
'GBT-H': [[], [8481, 32382]],
|
||||
'GBT-V': [[], [8481, 32382]],
|
||||
'GBTpc-EUC-H': [[0, 128, 253, 255], [41377, 64766]],
|
||||
'GBTpc-EUC-V': [[0, 128, 253, 255], [41377, 64766]],
|
||||
'UniGB-UCS2-H': [[], [0, 55295, 57344, 65535]],
|
||||
'UniGB-UCS2-V': [[], [0, 55295, 57344, 65535]],
|
||||
'UniGB-UTF16-H': [[], [0, 55295, 57344, 65535], [], [3623934976, 3690979327]],
|
||||
'UniGB-UTF16-V': [[], [0, 55295, 57344, 65535], [], [3623934976, 3690979327]],
|
||||
'78-EUC-H': [[0, 128], [36512, 36575, 41377, 65278]],
|
||||
'78-EUC-V': [[0, 128], [36512, 36575, 41377, 65278]],
|
||||
'78-H': [[], [8481, 32382]],
|
||||
'78-RKSJ-H': [[0, 128, 160, 223], [33088, 40956, 57408, 64764]],
|
||||
'78-RKSJ-V': [[0, 128, 160, 223], [33088, 40956, 57408, 64764]],
|
||||
'78-V': [[], [8481, 32382]],
|
||||
'78ms-RKSJ-H': [[0, 128, 160, 223], [33088, 40956, 57408, 64764]],
|
||||
'78ms-RKSJ-V': [[0, 128, 160, 223], [33088, 40956, 57408, 64764]],
|
||||
'83pv-RKSJ-H': [[0, 128, 160, 223, 253, 255], [33088, 40956, 57408, 64764]],
|
||||
'90ms-RKSJ-H': [[0, 128, 160, 223], [33088, 40956, 57408, 64764]],
|
||||
'90ms-RKSJ-V': [[0, 128, 160, 223], [33088, 40956, 57408, 64764]],
|
||||
'90msp-RKSJ-H': [[0, 128, 160, 223], [33088, 40956, 57408, 64764]],
|
||||
'90msp-RKSJ-V': [[0, 128, 160, 223], [33088, 40956, 57408, 64764]],
|
||||
'90pv-RKSJ-H': [[0, 128, 160, 223, 253, 255], [33088, 40956, 57408, 64764]],
|
||||
'90pv-RKSJ-V': [[0, 128, 160, 223, 253, 255], [33088, 40956, 57408, 64764]],
|
||||
'Add-H': [[], [8481, 32382]],
|
||||
'Add-RKSJ-H': [[0, 128, 160, 223], [33088, 40956, 57408, 64764]],
|
||||
'Add-RKSJ-V': [[0, 128, 160, 223], [33088, 40956, 57408, 64764]],
|
||||
'Add-V': [[], [8481, 32382]],
|
||||
'Adobe-Japan1-0': [[], [0, 8447]],
|
||||
'Adobe-Japan1-1': [[], [0, 8447]],
|
||||
'Adobe-Japan1-2': [[], [0, 8959]],
|
||||
'Adobe-Japan1-3': [[], [0, 9471]],
|
||||
'Adobe-Japan1-4': [[], [0, 15615]],
|
||||
'Adobe-Japan1-5': [[], [0, 20479]],
|
||||
'Adobe-Japan1-6': [[], [0, 23295]],
|
||||
'Adobe-Japan1-UCS2': [[], [0, 65535]],
|
||||
'Adobe-Japan2-0': [[], [0, 6143]],
|
||||
'EUC-H': [[0, 128], [36512, 36575, 41377, 65278]],
|
||||
'EUC-V': [[0, 128], [36512, 36575, 41377, 65278]],
|
||||
'Ext-H': [[], [8481, 32382]],
|
||||
'Ext-RKSJ-H': [[0, 128, 160, 223], [33088, 40956, 57408, 64764]],
|
||||
'Ext-RKSJ-V': [[0, 128, 160, 223], [33088, 40956, 57408, 64764]],
|
||||
'Ext-V': [[], [8481, 32382]],
|
||||
'H': [[], [8481, 32382]],
|
||||
'Hankaku': [[0, 255], []],
|
||||
'Hiragana': [[0, 255], []],
|
||||
'Hojo-EUC-H': [[], [], [9413025, 9436926], []],
|
||||
'Hojo-EUC-V': [[], [], [9413025, 9436926], []],
|
||||
'Hojo-H': [[], [8481, 32382]],
|
||||
'Hojo-V': [[], [8481, 32382]],
|
||||
'Katakana': [[0, 255], []],
|
||||
'NWP-H': [[], [8481, 32382]],
|
||||
'NWP-V': [[], [8481, 32382]],
|
||||
'RKSJ-H': [[0, 128, 160, 223], [33088, 40956, 57408, 64764]],
|
||||
'RKSJ-V': [[0, 128, 160, 223], [33088, 40956, 57408, 64764]],
|
||||
'Roman': [[0, 255], []],
|
||||
'UniHojo-UCS2-H': [[], [0, 55295, 57344, 65535]],
|
||||
'UniHojo-UCS2-V': [[], [0, 55295, 57344, 65535]],
|
||||
'UniHojo-UTF16-H': [[], [0, 55295, 57344, 65535], [],
|
||||
[3623934976, 3690979327]],
|
||||
'UniHojo-UTF16-V': [[], [0, 55295, 57344, 65535], [],
|
||||
[3623934976, 3690979327]],
|
||||
'UniJIS-UCS2-H': [[], [0, 55295, 57344, 65535]],
|
||||
'UniJIS-UCS2-HW-H': [[], [0, 55295, 57344, 65535]],
|
||||
'UniJIS-UCS2-HW-V': [[], [0, 55295, 57344, 65535]],
|
||||
'UniJIS-UCS2-V': [[], [0, 55295, 57344, 65535]],
|
||||
'UniJIS-UTF16-H': [[], [0, 55295, 57344, 65535], [],
|
||||
[3623934976, 3690979327]],
|
||||
'UniJIS-UTF16-V': [[], [0, 55295, 57344, 65535], [],
|
||||
[3623934976, 3690979327]],
|
||||
'UniJISPro-UCS2-HW-V': [[], [0, 55295, 57344, 65535]],
|
||||
'UniJISPro-UCS2-V': [[], [0, 55295, 57344, 65535]],
|
||||
'V': [[], [8481, 32382]],
|
||||
'WP-Symbol': [[0, 255], []],
|
||||
'Adobe-Korea1-0': [[], [0, 9471]],
|
||||
'Adobe-Korea1-1': [[], [0, 18175]],
|
||||
'Adobe-Korea1-2': [[], [0, 18431]],
|
||||
'Adobe-Korea1-UCS2': [[], [0, 65535]],
|
||||
'KSC-EUC-H': [[0, 128], [41377, 65278]],
|
||||
'KSC-EUC-V': [[0, 128], [41377, 65278]],
|
||||
'KSC-H': [[], [8481, 32382]],
|
||||
'KSC-Johab-H': [[0, 128], [33857, 54270, 55345, 57086, 57393, 63998]],
|
||||
'KSC-Johab-V': [[0, 128], [33857, 54270, 55345, 57086, 57393, 63998]],
|
||||
'KSC-V': [[], [8481, 32382]],
|
||||
'KSCms-UHC-H': [[0, 128], [33089, 65278]],
|
||||
'KSCms-UHC-HW-H': [[0, 128], [33089, 65278]],
|
||||
'KSCms-UHC-HW-V': [[0, 128], [33089, 65278]],
|
||||
'KSCms-UHC-V': [[0, 128], [33089, 65278]],
|
||||
'KSCpc-EUC-H': [[0, 132, 254, 255], [41281, 65022]],
|
||||
'KSCpc-EUC-V': [[0, 132, 254, 255], [41281, 65022]],
|
||||
'UniKS-UCS2-H': [[], [0, 55295, 57344, 65535]],
|
||||
'UniKS-UCS2-V': [[], [0, 55295, 57344, 65535]],
|
||||
'UniKS-UTF16-H': [[], [0, 55295, 57344, 65535], [], [3623934976, 3690979327]],
|
||||
'UniKS-UTF16-V': [[], [0, 55295, 57344, 65535], [], [3623934976, 3690979327]]
|
||||
};
|
||||
var BUILT_IN_CMAPS = [
|
||||
// << Start unicode maps.
|
||||
'Adobe-GB1-UCS2',
|
||||
'Adobe-CNS1-UCS2',
|
||||
'Adobe-Japan1-UCS2',
|
||||
'Adobe-Korea1-UCS2',
|
||||
// >> End unicode maps.
|
||||
'78-EUC-H',
|
||||
'78-EUC-V',
|
||||
'78-H',
|
||||
'78-RKSJ-H',
|
||||
'78-RKSJ-V',
|
||||
'78-V',
|
||||
'78ms-RKSJ-H',
|
||||
'78ms-RKSJ-V',
|
||||
'83pv-RKSJ-H',
|
||||
'90ms-RKSJ-H',
|
||||
'90ms-RKSJ-V',
|
||||
'90msp-RKSJ-H',
|
||||
'90msp-RKSJ-V',
|
||||
'90pv-RKSJ-H',
|
||||
'90pv-RKSJ-V',
|
||||
'Add-H',
|
||||
'Add-RKSJ-H',
|
||||
'Add-RKSJ-V',
|
||||
'Add-V',
|
||||
'Adobe-CNS1-0',
|
||||
'Adobe-CNS1-1',
|
||||
'Adobe-CNS1-2',
|
||||
'Adobe-CNS1-3',
|
||||
'Adobe-CNS1-4',
|
||||
'Adobe-CNS1-5',
|
||||
'Adobe-CNS1-6',
|
||||
'Adobe-GB1-0',
|
||||
'Adobe-GB1-1',
|
||||
'Adobe-GB1-2',
|
||||
'Adobe-GB1-3',
|
||||
'Adobe-GB1-4',
|
||||
'Adobe-GB1-5',
|
||||
'Adobe-Japan1-0',
|
||||
'Adobe-Japan1-1',
|
||||
'Adobe-Japan1-2',
|
||||
'Adobe-Japan1-3',
|
||||
'Adobe-Japan1-4',
|
||||
'Adobe-Japan1-5',
|
||||
'Adobe-Japan1-6',
|
||||
'Adobe-Korea1-0',
|
||||
'Adobe-Korea1-1',
|
||||
'Adobe-Korea1-2',
|
||||
'B5-H',
|
||||
'B5-V',
|
||||
'B5pc-H',
|
||||
'B5pc-V',
|
||||
'CNS-EUC-H',
|
||||
'CNS-EUC-V',
|
||||
'CNS1-H',
|
||||
'CNS1-V',
|
||||
'CNS2-H',
|
||||
'CNS2-V',
|
||||
'ETHK-B5-H',
|
||||
'ETHK-B5-V',
|
||||
'ETen-B5-H',
|
||||
'ETen-B5-V',
|
||||
'ETenms-B5-H',
|
||||
'ETenms-B5-V',
|
||||
'EUC-H',
|
||||
'EUC-V',
|
||||
'Ext-H',
|
||||
'Ext-RKSJ-H',
|
||||
'Ext-RKSJ-V',
|
||||
'Ext-V',
|
||||
'GB-EUC-H',
|
||||
'GB-EUC-V',
|
||||
'GB-H',
|
||||
'GB-V',
|
||||
'GBK-EUC-H',
|
||||
'GBK-EUC-V',
|
||||
'GBK2K-H',
|
||||
'GBK2K-V',
|
||||
'GBKp-EUC-H',
|
||||
'GBKp-EUC-V',
|
||||
'GBT-EUC-H',
|
||||
'GBT-EUC-V',
|
||||
'GBT-H',
|
||||
'GBT-V',
|
||||
'GBTpc-EUC-H',
|
||||
'GBTpc-EUC-V',
|
||||
'GBpc-EUC-H',
|
||||
'GBpc-EUC-V',
|
||||
'H',
|
||||
'HKdla-B5-H',
|
||||
'HKdla-B5-V',
|
||||
'HKdlb-B5-H',
|
||||
'HKdlb-B5-V',
|
||||
'HKgccs-B5-H',
|
||||
'HKgccs-B5-V',
|
||||
'HKm314-B5-H',
|
||||
'HKm314-B5-V',
|
||||
'HKm471-B5-H',
|
||||
'HKm471-B5-V',
|
||||
'HKscs-B5-H',
|
||||
'HKscs-B5-V',
|
||||
'Hankaku',
|
||||
'Hiragana',
|
||||
'KSC-EUC-H',
|
||||
'KSC-EUC-V',
|
||||
'KSC-H',
|
||||
'KSC-Johab-H',
|
||||
'KSC-Johab-V',
|
||||
'KSC-V',
|
||||
'KSCms-UHC-H',
|
||||
'KSCms-UHC-HW-H',
|
||||
'KSCms-UHC-HW-V',
|
||||
'KSCms-UHC-V',
|
||||
'KSCpc-EUC-H',
|
||||
'KSCpc-EUC-V',
|
||||
'Katakana',
|
||||
'NWP-H',
|
||||
'NWP-V',
|
||||
'RKSJ-H',
|
||||
'RKSJ-V',
|
||||
'Roman',
|
||||
'UniCNS-UCS2-H',
|
||||
'UniCNS-UCS2-V',
|
||||
'UniCNS-UTF16-H',
|
||||
'UniCNS-UTF16-V',
|
||||
'UniCNS-UTF32-H',
|
||||
'UniCNS-UTF32-V',
|
||||
'UniCNS-UTF8-H',
|
||||
'UniCNS-UTF8-V',
|
||||
'UniGB-UCS2-H',
|
||||
'UniGB-UCS2-V',
|
||||
'UniGB-UTF16-H',
|
||||
'UniGB-UTF16-V',
|
||||
'UniGB-UTF32-H',
|
||||
'UniGB-UTF32-V',
|
||||
'UniGB-UTF8-H',
|
||||
'UniGB-UTF8-V',
|
||||
'UniJIS-UCS2-H',
|
||||
'UniJIS-UCS2-HW-H',
|
||||
'UniJIS-UCS2-HW-V',
|
||||
'UniJIS-UCS2-V',
|
||||
'UniJIS-UTF16-H',
|
||||
'UniJIS-UTF16-V',
|
||||
'UniJIS-UTF32-H',
|
||||
'UniJIS-UTF32-V',
|
||||
'UniJIS-UTF8-H',
|
||||
'UniJIS-UTF8-V',
|
||||
'UniJIS2004-UTF16-H',
|
||||
'UniJIS2004-UTF16-V',
|
||||
'UniJIS2004-UTF32-H',
|
||||
'UniJIS2004-UTF32-V',
|
||||
'UniJIS2004-UTF8-H',
|
||||
'UniJIS2004-UTF8-V',
|
||||
'UniJISPro-UCS2-HW-V',
|
||||
'UniJISPro-UCS2-V',
|
||||
'UniJISPro-UTF8-V',
|
||||
'UniJISX0213-UTF32-H',
|
||||
'UniJISX0213-UTF32-V',
|
||||
'UniJISX02132004-UTF32-H',
|
||||
'UniJISX02132004-UTF32-V',
|
||||
'UniKS-UCS2-H',
|
||||
'UniKS-UCS2-V',
|
||||
'UniKS-UTF16-H',
|
||||
'UniKS-UTF16-V',
|
||||
'UniKS-UTF32-H',
|
||||
'UniKS-UTF32-V',
|
||||
'UniKS-UTF8-H',
|
||||
'UniKS-UTF8-V',
|
||||
'V',
|
||||
'WP-Symbol'];
|
||||
|
||||
// CMap, not to be confused with TrueType's cmap.
|
||||
var CMap = (function CMapClosure() {
|
||||
function CMap() {
|
||||
function CMap(builtInCMap) {
|
||||
// Codespace ranges are stored as follows:
|
||||
// [[1BytePairs], [2BytePairs], [3BytePairs], [4BytePairs]]
|
||||
// where nBytePairs are ranges e.g. [low1, high1, low2, high2, ...]
|
||||
this.codespaceRanges = [[], [], [], []];
|
||||
this.numCodespaceRanges = 0;
|
||||
this.map = [];
|
||||
this.vertical = false;
|
||||
this.useCMap = null;
|
||||
this.builtInCMap = builtInCMap;
|
||||
}
|
||||
CMap.prototype = {
|
||||
addCodespaceRange: function(n, low, high) {
|
||||
this.codespaceRanges[n - 1].push(low, high);
|
||||
this.numCodespaceRanges++;
|
||||
},
|
||||
|
||||
mapRange: function(low, high, dstLow) {
|
||||
@ -395,17 +410,33 @@ var CMapFactory = (function CMapFactoryClosure() {
|
||||
error('Invalid codespace range.');
|
||||
}
|
||||
|
||||
function parseCmap(cMap, lexer) {
|
||||
function parseWMode(cMap, lexer) {
|
||||
var obj = lexer.getObj();
|
||||
if (isInt(obj)) {
|
||||
cMap.vertical = !!obj;
|
||||
}
|
||||
}
|
||||
|
||||
function parseCMap(cMap, lexer, builtInCMapUrl, useCMap) {
|
||||
var previous;
|
||||
var embededUseCMap;
|
||||
objLoop: while (true) {
|
||||
var obj = lexer.getObj();
|
||||
if (isEOF(obj)) {
|
||||
break;
|
||||
} else if (isName(obj)) {
|
||||
if (obj.name === 'WMode') {
|
||||
parseWMode(cMap, lexer);
|
||||
}
|
||||
previous = obj;
|
||||
} else if (isCmd(obj)) {
|
||||
switch (obj.cmd) {
|
||||
case 'endcMap':
|
||||
case 'endcmap':
|
||||
break objLoop;
|
||||
case 'usecMap':
|
||||
// TODO
|
||||
case 'usecmap':
|
||||
if (isName(previous)) {
|
||||
embededUseCMap = previous.name;
|
||||
}
|
||||
break;
|
||||
case 'begincodespacerange':
|
||||
parseCodespaceRange(cMap, lexer);
|
||||
@ -425,30 +456,66 @@ var CMapFactory = (function CMapFactoryClosure() {
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
return {
|
||||
create: function (encoding) {
|
||||
if (isName(encoding)) {
|
||||
switch (encoding.name) {
|
||||
case 'Identity-H':
|
||||
return new IdentityCMap(false, 2);
|
||||
case 'Identity-V':
|
||||
return new IdentityCMap(true, 2);
|
||||
default:
|
||||
if (encoding.name in CMAP_CODESPACES) {
|
||||
// XXX: Temporary hack so the correct amount of bytes are read in
|
||||
// CMap.readCharCode.
|
||||
var cMap = new CMap();
|
||||
cMap.codespaceRanges = CMAP_CODESPACES[encoding.name];
|
||||
return cMap;
|
||||
}
|
||||
return null;
|
||||
|
||||
if (!useCMap && embededUseCMap) {
|
||||
// Load the usecmap definition from the file only if there wasn't one
|
||||
// specified.
|
||||
useCMap = embededUseCMap;
|
||||
}
|
||||
if (useCMap) {
|
||||
cMap.useCMap = createBuiltInCMap(useCMap, builtInCMapUrl);
|
||||
// If there aren't any code space ranges defined clone all the parent ones
|
||||
// into this cMap.
|
||||
if (cMap.numCodespaceRanges === 0) {
|
||||
var useCodespaceRanges = cMap.useCMap.codespaceRanges;
|
||||
for (var i = 0; i < useCodespaceRanges.length; i++) {
|
||||
cMap.codespaceRanges[i] = useCodespaceRanges[i].slice();
|
||||
}
|
||||
cMap.numCodespaceRanges = cMap.useCMap.numCodespaceRanges;
|
||||
}
|
||||
// Merge the map into the current one, making sure not to override
|
||||
// any previously defined entries.
|
||||
for (var key in cMap.useCMap.map) {
|
||||
if (key in cMap.map) {
|
||||
continue;
|
||||
}
|
||||
cMap.map[key] = cMap.useCMap.map[key];
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function createBuiltInCMap(name, builtInCMapUrl) {
|
||||
if (name === 'Identity-H') {
|
||||
return new IdentityCMap(false, 2);
|
||||
} else if (name === 'Identity-V') {
|
||||
return new IdentityCMap(true, 2);
|
||||
}
|
||||
if (BUILT_IN_CMAPS.indexOf(name) === -1) {
|
||||
error('Unknown cMap name: ' + name);
|
||||
}
|
||||
|
||||
var request = new XMLHttpRequest();
|
||||
var url = builtInCMapUrl + name;
|
||||
request.open('GET', url, false);
|
||||
request.send(null);
|
||||
if (request.status === 0 && /^https?:/i.test(url)) {
|
||||
error('Unable to get cMap at: ' + url);
|
||||
}
|
||||
var cMap = new CMap(true);
|
||||
var lexer = new Lexer(new StringStream(request.responseText));
|
||||
parseCMap(cMap, lexer, builtInCMapUrl, null);
|
||||
return cMap;
|
||||
}
|
||||
|
||||
return {
|
||||
create: function (encoding, builtInCMapUrl, useCMap) {
|
||||
if (isName(encoding)) {
|
||||
return createBuiltInCMap(encoding.name, builtInCMapUrl);
|
||||
} else if (isStream(encoding)) {
|
||||
var cMap = new CMap();
|
||||
var lexer = new Lexer(encoding);
|
||||
try {
|
||||
parseCmap(cMap, lexer);
|
||||
parseCMap(cMap, lexer, builtInCMapUrl, useCMap);
|
||||
} catch (e) {
|
||||
warn('Invalid CMap data. ' + e);
|
||||
}
|
||||
|
||||
@ -828,41 +828,21 @@ var PartialEvaluator = (function PartialEvaluatorClosure() {
|
||||
}
|
||||
|
||||
// Based on 9.6.6 of the spec the encoding can come from multiple places
|
||||
// but should be prioritized in the following order:
|
||||
// 1. Encoding dictionary
|
||||
// 2. Encoding within font file (Type1 or Type1C)
|
||||
// 3. Default (depends on font type)
|
||||
// Differences applied to the above.
|
||||
// Note: we don't fill in the encoding from the font file(2) here but use
|
||||
// the flag overridableEncoding to signal that the font can override the
|
||||
// encoding if it has one built in.
|
||||
var overridableEncoding = true;
|
||||
var hasEncoding = false;
|
||||
var flags = properties.flags;
|
||||
// and depends on the font type. The base encoding and differences are
|
||||
// read here, but the encoding that is actually used is chosen during
|
||||
// glyph mapping in the font.
|
||||
// TODO: Loading the built in encoding in the font would allow the
|
||||
// differences to be merged in here not require us to hold on to it.
|
||||
var differences = [];
|
||||
var baseEncoding = properties.type === 'TrueType' ?
|
||||
Encodings.WinAnsiEncoding :
|
||||
Encodings.StandardEncoding;
|
||||
// The Symbolic attribute can be misused for regular fonts
|
||||
// Heuristic: we have to check if the font is a standard one and has
|
||||
// Symbolic font name
|
||||
if (!!(flags & FontFlags.Symbolic)) {
|
||||
baseEncoding = !properties.file && /Symbol/i.test(properties.name) ?
|
||||
Encodings.SymbolSetEncoding : Encodings.MacRomanEncoding;
|
||||
}
|
||||
var baseEncodingName = null;
|
||||
if (dict.has('Encoding')) {
|
||||
var encoding = dict.get('Encoding');
|
||||
if (isDict(encoding)) {
|
||||
var baseName = encoding.get('BaseEncoding');
|
||||
if (baseName) {
|
||||
overridableEncoding = false;
|
||||
hasEncoding = true;
|
||||
baseEncoding = Encodings[baseName.name];
|
||||
}
|
||||
|
||||
baseEncodingName = encoding.get('BaseEncoding');
|
||||
baseEncodingName = isName(baseEncodingName) ? baseEncodingName.name :
|
||||
null;
|
||||
// Load the differences between the base and original
|
||||
if (encoding.has('Differences')) {
|
||||
hasEncoding = true;
|
||||
var diffEncoding = encoding.get('Differences');
|
||||
var index = 0;
|
||||
for (var j = 0, jj = diffEncoding.length; j < jj; j++) {
|
||||
@ -874,38 +854,44 @@ var PartialEvaluator = (function PartialEvaluatorClosure() {
|
||||
}
|
||||
}
|
||||
} else if (isName(encoding)) {
|
||||
overridableEncoding = false;
|
||||
hasEncoding = true;
|
||||
var currentEncoding = Encodings[encoding.name];
|
||||
|
||||
// Some bad PDF files contain fonts whose encoding name is not among
|
||||
// the predefined encodings, causing baseEncoding to be undefined.
|
||||
// In this case, fallback to using the baseEncoding as defined above
|
||||
// and let the font override the encoding if one is available.
|
||||
if (currentEncoding) {
|
||||
baseEncoding = currentEncoding;
|
||||
} else {
|
||||
overridableEncoding = true;
|
||||
}
|
||||
baseEncodingName = encoding.name;
|
||||
} else {
|
||||
error('Encoding is not a Name nor a Dict');
|
||||
}
|
||||
// According to table 114 if the encoding is a named encoding it must be
|
||||
// one of these predefined encodings.
|
||||
if ((baseEncodingName !== 'MacRomanEncoding' &&
|
||||
baseEncodingName !== 'MacExpertEncoding' &&
|
||||
baseEncodingName !== 'WinAnsiEncoding')) {
|
||||
baseEncodingName = null;
|
||||
}
|
||||
}
|
||||
|
||||
if (baseEncodingName) {
|
||||
properties.defaultEncoding = Encodings[baseEncodingName].slice();
|
||||
} else {
|
||||
var encoding = properties.type === 'TrueType' ?
|
||||
Encodings.WinAnsiEncoding :
|
||||
Encodings.StandardEncoding;
|
||||
// The Symbolic attribute can be misused for regular fonts
|
||||
// Heuristic: we have to check if the font is a standard one also
|
||||
if (!!(properties.flags & FontFlags.Symbolic)) {
|
||||
encoding = !properties.file && /Symbol/i.test(properties.name) ?
|
||||
Encodings.SymbolSetEncoding : Encodings.MacRomanEncoding;
|
||||
}
|
||||
properties.defaultEncoding = encoding;
|
||||
}
|
||||
|
||||
properties.differences = differences;
|
||||
properties.baseEncoding = baseEncoding;
|
||||
properties.hasEncoding = hasEncoding;
|
||||
properties.overridableEncoding = overridableEncoding;
|
||||
properties.baseEncodingName = baseEncodingName;
|
||||
properties.dict = dict;
|
||||
},
|
||||
|
||||
readToUnicode: function PartialEvaluator_readToUnicode(toUnicode, xref,
|
||||
properties) {
|
||||
readToUnicode: function PartialEvaluator_readToUnicode(toUnicode) {
|
||||
var cmapObj = toUnicode;
|
||||
var charToUnicode = [];
|
||||
if (isName(cmapObj)) {
|
||||
var isIdentityMap = cmapObj.name.substr(0, 9) == 'Identity-';
|
||||
if (!isIdentityMap)
|
||||
error('ToUnicode file cmap translation not implemented');
|
||||
return CMapFactory.create(cmapObj).map;
|
||||
} else if (isStream(cmapObj)) {
|
||||
var cmap = CMapFactory.create(cmapObj).map;
|
||||
// Convert UTF-16BE
|
||||
@ -927,7 +913,7 @@ var PartialEvaluator = (function PartialEvaluatorClosure() {
|
||||
});
|
||||
return cmap;
|
||||
}
|
||||
return charToUnicode;
|
||||
return null;
|
||||
},
|
||||
readCidToGidMap: function PartialEvaluator_readCidToGidMap(cidToGidStream) {
|
||||
// Extract the encoding from the CIDToGIDMap
|
||||
@ -1006,7 +992,8 @@ var PartialEvaluator = (function PartialEvaluatorClosure() {
|
||||
if (isName(baseFontName)) {
|
||||
var metrics = this.getBaseFontMetrics(baseFontName.name);
|
||||
|
||||
glyphsWidths = metrics.widths;
|
||||
glyphsWidths = this.buildCharCodeToWidth(metrics.widths,
|
||||
properties);
|
||||
defaultWidth = metrics.defaultWidth;
|
||||
}
|
||||
}
|
||||
@ -1074,6 +1061,25 @@ var PartialEvaluator = (function PartialEvaluatorClosure() {
|
||||
};
|
||||
},
|
||||
|
||||
buildCharCodeToWidth: function PartialEvaluator_bulildCharCodeToWidth(
|
||||
widthsByGlyphName, properties) {
|
||||
var widths = Object.create(null);
|
||||
var differences = properties.differences;
|
||||
var encoding = properties.defaultEncoding;
|
||||
for (var charCode = 0; charCode < 256; charCode++) {
|
||||
if (charCode in differences &&
|
||||
widthsByGlyphName[differences[charCode]]) {
|
||||
widths[charCode] = widthsByGlyphName[differences[charCode]];
|
||||
continue;
|
||||
}
|
||||
if (charCode in encoding && widthsByGlyphName[encoding[charCode]]) {
|
||||
widths[charCode] = widthsByGlyphName[encoding[charCode]];
|
||||
continue;
|
||||
}
|
||||
}
|
||||
return widths;
|
||||
},
|
||||
|
||||
translateFont: function PartialEvaluator_translateFont(dict,
|
||||
xref) {
|
||||
var baseDict = dict;
|
||||
@ -1135,6 +1141,8 @@ var PartialEvaluator = (function PartialEvaluatorClosure() {
|
||||
lastChar: maxCharIndex
|
||||
};
|
||||
this.extractDataStructures(dict, dict, xref, properties);
|
||||
properties.widths = this.buildCharCodeToWidth(metrics.widths,
|
||||
properties);
|
||||
|
||||
return new Font(baseFontName, null, properties);
|
||||
}
|
||||
@ -1212,12 +1220,12 @@ var PartialEvaluator = (function PartialEvaluatorClosure() {
|
||||
var cidEncoding = baseDict.get('Encoding');
|
||||
if (isName(cidEncoding)) {
|
||||
properties.cidEncoding = cidEncoding.name;
|
||||
properties.vertical = /-V$/.test(cidEncoding.name);
|
||||
}
|
||||
properties.cmap = CMapFactory.create(cidEncoding);
|
||||
properties.cMap = CMapFactory.create(cidEncoding, PDFJS.cMapUrl, null);
|
||||
properties.vertical = properties.cMap.vertical;
|
||||
}
|
||||
this.extractWidths(dict, xref, descriptor, properties);
|
||||
this.extractDataStructures(dict, baseDict, xref, properties);
|
||||
this.extractWidths(dict, xref, descriptor, properties);
|
||||
|
||||
if (type.name === 'Type3') {
|
||||
properties.coded = true;
|
||||
|
||||
1350
src/core/fonts.js
1350
src/core/fonts.js
File diff suppressed because it is too large
Load Diff
@ -239,6 +239,8 @@ var WorkerMessageHandler = PDFJS.WorkerMessageHandler = {
|
||||
PDFJS.disableFontFace = data.disableFontFace;
|
||||
PDFJS.disableCreateObjectURL = data.disableCreateObjectURL;
|
||||
PDFJS.verbosity = data.verbosity;
|
||||
PDFJS.cMapUrl = data.cMapUrl === undefined ?
|
||||
null : data.cMapUrl;
|
||||
|
||||
getPdfManager(data).then(function () {
|
||||
pdfManager.onLoadedStream().then(function(stream) {
|
||||
|
||||
@ -30,6 +30,13 @@
|
||||
PDFJS.maxImageSize = PDFJS.maxImageSize === undefined ? -1 : PDFJS.maxImageSize;
|
||||
|
||||
/**
|
||||
* The url of where the predefined Adobe CMaps are located. Include trailing
|
||||
* slash.
|
||||
* @var {string}
|
||||
*/
|
||||
PDFJS.cMapUrl = PDFJS.cMapUrl === undefined ? null : PDFJS.cMapUrl;
|
||||
|
||||
/*
|
||||
* By default fonts are converted to OpenType fonts and loaded via font face
|
||||
* rules. If disabled, the font will be rendered using a built in font renderer
|
||||
* that constructs the glyphs with primitive path commands.
|
||||
@ -917,6 +924,7 @@ var WorkerTransport = (function WorkerTransportClosure() {
|
||||
source: source,
|
||||
disableRange: PDFJS.disableRange,
|
||||
maxImageSize: PDFJS.maxImageSize,
|
||||
cMapUrl: PDFJS.cMapUrl,
|
||||
disableFontFace: PDFJS.disableFontFace,
|
||||
disableCreateObjectURL: PDFJS.disableCreateObjectURL,
|
||||
verbosity: PDFJS.verbosity
|
||||
|
||||
@ -1383,38 +1383,37 @@ var CanvasGraphics = (function CanvasGraphicsClosure() {
|
||||
var accent = glyph.accent;
|
||||
|
||||
var scaledX, scaledY, scaledAccentX, scaledAccentY;
|
||||
if (!glyph.disabled) {
|
||||
if (vertical) {
|
||||
scaledX = vx / fontSizeScale;
|
||||
scaledY = (x + vy) / fontSizeScale;
|
||||
} else {
|
||||
scaledX = x / fontSizeScale;
|
||||
scaledY = 0;
|
||||
}
|
||||
|
||||
if (font.remeasure && width > 0 && this.isFontSubpixelAAEnabled) {
|
||||
// some standard fonts may not have the exact width, trying to
|
||||
// rescale per character
|
||||
var measuredWidth = ctx.measureText(character).width * 1000 /
|
||||
current.fontSize * current.fontSizeScale;
|
||||
var characterScaleX = width / measuredWidth;
|
||||
restoreNeeded = true;
|
||||
ctx.save();
|
||||
ctx.scale(characterScaleX, 1);
|
||||
scaledX /= characterScaleX;
|
||||
if (accent) {
|
||||
scaledAccentX /= characterScaleX;
|
||||
}
|
||||
}
|
||||
if (vertical) {
|
||||
scaledX = vx / fontSizeScale;
|
||||
scaledY = (x + vy) / fontSizeScale;
|
||||
} else {
|
||||
scaledX = x / fontSizeScale;
|
||||
scaledY = 0;
|
||||
}
|
||||
|
||||
this.paintChar(character, scaledX, scaledY);
|
||||
if (font.remeasure && width > 0 && this.isFontSubpixelAAEnabled) {
|
||||
// some standard fonts may not have the exact width, trying to
|
||||
// rescale per character
|
||||
var measuredWidth = ctx.measureText(character).width * 1000 /
|
||||
current.fontSize * current.fontSizeScale;
|
||||
var characterScaleX = width / measuredWidth;
|
||||
restoreNeeded = true;
|
||||
ctx.save();
|
||||
ctx.scale(characterScaleX, 1);
|
||||
scaledX /= characterScaleX;
|
||||
if (accent) {
|
||||
scaledAccentX = scaledX + accent.offset.x / fontSizeScale;
|
||||
scaledAccentY = scaledY - accent.offset.y / fontSizeScale;
|
||||
this.paintChar(accent.fontChar, scaledAccentX, scaledAccentY);
|
||||
scaledAccentX /= characterScaleX;
|
||||
}
|
||||
}
|
||||
|
||||
this.paintChar(character, scaledX, scaledY);
|
||||
if (accent) {
|
||||
scaledAccentX = scaledX + accent.offset.x / fontSizeScale;
|
||||
scaledAccentY = scaledY - accent.offset.y / fontSizeScale;
|
||||
this.paintChar(accent.fontChar, scaledAccentX, scaledAccentY);
|
||||
}
|
||||
|
||||
x += charWidth;
|
||||
|
||||
canvasWidth += charWidth;
|
||||
|
||||
@ -28,6 +28,7 @@
|
||||
// "firefox-bin: Fatal IO error 12 (Cannot allocate memory) on X server :1."
|
||||
// PDFJS.disableWorker = true;
|
||||
PDFJS.enableStats = true;
|
||||
PDFJS.cMapUrl = '../external/cmaps/';
|
||||
|
||||
var appPath, masterMode, browser, canvas, dummyCanvas, currentTaskIdx,
|
||||
manifest, stdout;
|
||||
|
||||
@ -9,7 +9,9 @@ describe('font_fpgm', function() {
|
||||
var font = new Font("font", new Stream(font2324), {
|
||||
loadedName: 'font',
|
||||
type: 'CIDFontType2',
|
||||
differences: []
|
||||
differences: [],
|
||||
defaultEncoding: [],
|
||||
cMap: CMapFactory.create(new Name('Identity-H'))
|
||||
});
|
||||
ttx(font.data, function(result) { output = result; });
|
||||
runs(function() {
|
||||
|
||||
@ -11,7 +11,7 @@ describe('font_post', function() {
|
||||
loadedName: 'font',
|
||||
type: 'TrueType',
|
||||
differences: [],
|
||||
baseEncoding: []
|
||||
defaultEncoding: []
|
||||
});
|
||||
ttx(font.data, function(result) { output = result; });
|
||||
runs(function() {
|
||||
@ -26,7 +26,9 @@ describe('font_post', function() {
|
||||
var font = new Font("font", new Stream(font1282), {
|
||||
loadedName: 'font',
|
||||
type: 'CIDFontType2',
|
||||
differences: []
|
||||
differences: [],
|
||||
defaultEncoding: [],
|
||||
cMap: CMapFactory.create(new Name('Identity-H'))
|
||||
});
|
||||
ttx(font.data, function(result) { output = result; });
|
||||
runs(function() {
|
||||
|
||||
@ -12,7 +12,8 @@ describe('font_post', function() {
|
||||
loadedName: 'font',
|
||||
type: 'CIDFontType2',
|
||||
differences: [],
|
||||
baseEncoding: []
|
||||
defaultEncoding: [],
|
||||
cMap: CMapFactory.create(new Name('Identity-H'))
|
||||
});
|
||||
ttx(font.data, function(result) { output = result; });
|
||||
runs(function() {
|
||||
@ -28,7 +29,7 @@ describe('font_post', function() {
|
||||
loadedName: 'font',
|
||||
type: 'TrueType',
|
||||
differences: [],
|
||||
baseEncoding: []
|
||||
defaultEncoding: []
|
||||
});
|
||||
ttx(font.data, function(result) { output = result; });
|
||||
runs(function() {
|
||||
@ -44,7 +45,7 @@ describe('font_post', function() {
|
||||
loadedName: 'font',
|
||||
type: 'TrueType',
|
||||
differences: [],
|
||||
baseEncoding: []
|
||||
defaultEncoding: []
|
||||
});
|
||||
ttx(font.data, function(result) { output = result; });
|
||||
runs(function() {
|
||||
|
||||
@ -28,6 +28,7 @@
|
||||
<script type="text/javascript" src="../../src/core/crypto.js"></script>
|
||||
<script type="text/javascript" src="../../src/core/pattern.js"></script>
|
||||
<script type="text/javascript" src="../../src/core/evaluator.js"></script>
|
||||
<script type="text/javascript" src="../../src/core/cmap.js"></script>
|
||||
<script type="text/javascript" src="../../src/core/fonts.js"></script>
|
||||
<script type="text/javascript" src="../../src/core/glyphlist.js"></script>
|
||||
<script type="text/javascript" src="../../src/core/image.js"></script>
|
||||
|
||||
@ -220,6 +220,11 @@ class TestHandlerBase(BaseHTTPRequestHandler):
|
||||
self.sendIndex(url.path, url.query)
|
||||
return
|
||||
|
||||
pieces = path.split(os.sep);
|
||||
if pieces[len(pieces) - 2] == 'cmaps':
|
||||
self.sendFile(path, '.properties');
|
||||
return
|
||||
|
||||
if not (prefix == DOC_ROOT
|
||||
and os.path.isfile(path)
|
||||
and ext in MIMEs):
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
||||
/* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
|
||||
/* globals expect, it, describe, StringStream, Lexer, CMapFactory */
|
||||
/* globals expect, it, describe, StringStream, Lexer, CMapFactory, Name */
|
||||
|
||||
'use strict';
|
||||
|
||||
@ -82,5 +82,22 @@ describe('cmap', function() {
|
||||
expect(c[0]).toEqual(0x8EA1A1A1);
|
||||
expect(c[1]).toEqual(4);
|
||||
});
|
||||
it('read usecmap', function() {
|
||||
var str = '/Adobe-Japan1-1 usecmap\n';
|
||||
var stream = new StringStream(str);
|
||||
var cmap = CMapFactory.create(stream, null, '../../external/cmaps/');
|
||||
expect(cmap.useCMap).toBeDefined();
|
||||
});
|
||||
it('parses wmode', function() {
|
||||
var str = '/WMode 1 def\n';
|
||||
var stream = new StringStream(str);
|
||||
var cmap = CMapFactory.create(stream);
|
||||
expect(cmap.vertical).toEqual(true);
|
||||
});
|
||||
it('loads built in cmap', function() {
|
||||
var cmap = CMapFactory.create(new Name('Adobe-Japan1-1'),
|
||||
'../../external/cmaps/',
|
||||
null);
|
||||
});
|
||||
});
|
||||
|
||||
|
||||
@ -386,7 +386,7 @@ describe('font', function() {
|
||||
var parser = new Type1Parser(stream);
|
||||
var props = { overridableEncoding: true };
|
||||
var program = parser.extractFontHeader(props);
|
||||
expect(props.baseEncoding[33]).toEqual('arrowright');
|
||||
expect(props.builtInEncoding[33]).toEqual('arrowright');
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
@ -62,6 +62,11 @@ PDFJS.imageResourcesPath = './images/';
|
||||
//#if (FIREFOX || MOZCENTRAL || B2G || GENERIC || CHROME)
|
||||
//PDFJS.workerSrc = '../build/pdf.worker.js';
|
||||
//#endif
|
||||
//#if !PRODUCTION
|
||||
PDFJS.cMapUrl = '../external/cmaps/';
|
||||
//#else
|
||||
//PDFJS.cMapUrl = '../web/cmaps/';
|
||||
//#endif
|
||||
|
||||
var mozL10n = document.mozL10n || document.webL10n;
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user