pdfjs-dist 2.2.228 → 2.6.347

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Potentially problematic release.


This version of pdfjs-dist might be problematic. Click here for more details.

Files changed (229) hide show
  1. package/README.md +4 -0
  2. package/bower.json +1 -1
  3. package/build/pdf.js +8816 -19300
  4. package/build/pdf.js.map +1 -1
  5. package/build/pdf.min.js +22 -1
  6. package/build/pdf.worker.entry.js +5 -3
  7. package/build/pdf.worker.js +27185 -35746
  8. package/build/pdf.worker.js.map +1 -1
  9. package/build/pdf.worker.min.js +22 -1
  10. package/es5/build/pdf.js +26665 -0
  11. package/es5/build/pdf.js.map +1 -0
  12. package/es5/build/pdf.min.js +22 -0
  13. package/{lib/shared/global_scope.js → es5/build/pdf.worker.entry.js} +5 -10
  14. package/es5/build/pdf.worker.js +61231 -0
  15. package/es5/build/pdf.worker.js.map +1 -0
  16. package/es5/build/pdf.worker.min.js +22 -0
  17. package/es5/image_decoders/pdf.image_decoders.js +12529 -0
  18. package/es5/image_decoders/pdf.image_decoders.js.map +1 -0
  19. package/es5/image_decoders/pdf.image_decoders.min.js +22 -0
  20. package/es5/web/images/annotation-check.svg +11 -0
  21. package/es5/web/images/annotation-comment.svg +16 -0
  22. package/es5/web/images/annotation-help.svg +26 -0
  23. package/es5/web/images/annotation-insert.svg +10 -0
  24. package/es5/web/images/annotation-key.svg +11 -0
  25. package/es5/web/images/annotation-newparagraph.svg +11 -0
  26. package/es5/web/images/annotation-noicon.svg +7 -0
  27. package/es5/web/images/annotation-note.svg +42 -0
  28. package/es5/web/images/annotation-paragraph.svg +16 -0
  29. package/es5/web/images/loading-icon.gif +0 -0
  30. package/es5/web/images/shadow.png +0 -0
  31. package/es5/web/pdf_viewer.css +406 -0
  32. package/es5/web/pdf_viewer.js +7886 -0
  33. package/es5/web/pdf_viewer.js.map +1 -0
  34. package/image_decoders/pdf.image_decoders.js +1498 -4832
  35. package/image_decoders/pdf.image_decoders.js.map +1 -1
  36. package/image_decoders/pdf.image_decoders.min.js +22 -1
  37. package/lib/README.md +7 -0
  38. package/lib/core/annotation.js +1144 -927
  39. package/lib/core/arithmetic_decoder.js +81 -97
  40. package/lib/core/bidi.js +54 -46
  41. package/lib/core/ccitt.js +88 -81
  42. package/lib/core/ccitt_stream.js +15 -14
  43. package/lib/core/cff_parser.js +747 -716
  44. package/lib/core/charsets.js +4 -4
  45. package/lib/core/chunked_stream.js +462 -553
  46. package/lib/core/cmap.js +231 -277
  47. package/lib/core/colorspace.js +715 -857
  48. package/lib/core/core_utils.js +57 -52
  49. package/lib/core/crypto.js +416 -437
  50. package/lib/core/document.js +629 -670
  51. package/lib/core/encodings.js +15 -15
  52. package/lib/core/evaluator.js +3229 -2800
  53. package/lib/core/font_renderer.js +135 -178
  54. package/lib/core/fonts.js +602 -534
  55. package/lib/core/function.js +355 -279
  56. package/lib/core/glyphlist.js +4527 -4526
  57. package/lib/core/image.js +442 -439
  58. package/lib/core/image_utils.js +221 -61
  59. package/lib/core/jbig2.js +325 -316
  60. package/lib/core/jbig2_stream.js +18 -17
  61. package/lib/core/jpeg_stream.js +21 -26
  62. package/lib/core/jpg.js +289 -233
  63. package/lib/core/jpx.js +161 -143
  64. package/lib/core/jpx_stream.js +28 -28
  65. package/lib/core/metrics.js +2928 -2928
  66. package/lib/core/murmurhash3.js +87 -102
  67. package/lib/core/obj.js +1343 -1300
  68. package/lib/core/operator_list.js +90 -67
  69. package/lib/core/parser.js +990 -987
  70. package/lib/core/pattern.js +105 -77
  71. package/lib/core/pdf_manager.js +149 -316
  72. package/lib/core/primitives.js +156 -104
  73. package/lib/core/ps_parser.js +175 -214
  74. package/lib/core/standard_fonts.js +237 -236
  75. package/lib/core/stream.js +94 -74
  76. package/lib/core/type1_parser.js +89 -69
  77. package/lib/core/unicode.js +1654 -1654
  78. package/lib/core/worker.js +275 -290
  79. package/lib/core/worker_stream.js +101 -210
  80. package/lib/core/writer.js +242 -0
  81. package/lib/display/annotation_layer.js +772 -1041
  82. package/lib/display/annotation_storage.js +89 -0
  83. package/lib/display/api.js +1575 -1868
  84. package/lib/display/api_compatibility.js +12 -17
  85. package/lib/display/canvas.js +370 -222
  86. package/lib/display/content_disposition.js +40 -59
  87. package/lib/display/display_utils.js +341 -536
  88. package/lib/display/fetch_stream.js +188 -304
  89. package/lib/display/font_loader.js +282 -414
  90. package/lib/display/metadata.js +81 -99
  91. package/lib/display/network.js +362 -511
  92. package/lib/display/network_utils.js +25 -18
  93. package/lib/display/node_stream.js +283 -465
  94. package/lib/display/node_utils.js +87 -0
  95. package/lib/display/optional_content_config.js +184 -0
  96. package/lib/display/pattern_helper.js +93 -44
  97. package/lib/display/svg.js +1163 -1401
  98. package/lib/display/text_layer.js +154 -137
  99. package/lib/display/transport_stream.js +237 -375
  100. package/lib/display/webgl.js +70 -83
  101. package/lib/display/worker_options.js +3 -3
  102. package/lib/display/xml_parser.js +303 -392
  103. package/lib/examples/node/domstubs.js +37 -37
  104. package/lib/pdf.js +220 -58
  105. package/lib/pdf.worker.js +14 -6
  106. package/lib/shared/compatibility.js +3 -246
  107. package/lib/shared/is_node.js +7 -6
  108. package/lib/shared/message_handler.js +327 -332
  109. package/lib/shared/util.js +271 -306
  110. package/lib/test/unit/annotation_spec.js +1902 -763
  111. package/lib/test/unit/annotation_storage_spec.js +83 -0
  112. package/lib/test/unit/api_spec.js +790 -592
  113. package/lib/test/unit/bidi_spec.js +7 -7
  114. package/lib/test/unit/cff_parser_spec.js +73 -72
  115. package/lib/test/unit/clitests_helper.js +7 -9
  116. package/lib/test/unit/cmap_spec.js +86 -88
  117. package/lib/test/unit/colorspace_spec.js +346 -154
  118. package/lib/test/unit/core_utils_spec.js +125 -105
  119. package/lib/test/unit/crypto_spec.js +232 -185
  120. package/lib/test/unit/custom_spec.js +150 -24
  121. package/lib/test/unit/display_svg_spec.js +34 -39
  122. package/lib/test/unit/display_utils_spec.js +139 -149
  123. package/lib/test/unit/document_spec.js +128 -17
  124. package/lib/test/unit/encodings_spec.js +12 -34
  125. package/lib/test/unit/evaluator_spec.js +112 -91
  126. package/lib/test/unit/fetch_stream_spec.js +31 -29
  127. package/lib/test/unit/function_spec.js +206 -204
  128. package/lib/test/unit/jasmine-boot.js +48 -32
  129. package/lib/test/unit/message_handler_spec.js +173 -159
  130. package/lib/test/unit/metadata_spec.js +71 -71
  131. package/lib/test/unit/murmurhash3_spec.js +12 -12
  132. package/lib/test/unit/network_spec.js +13 -11
  133. package/lib/test/unit/network_utils_spec.js +158 -144
  134. package/lib/test/unit/node_stream_spec.js +76 -90
  135. package/lib/test/unit/parser_spec.js +108 -114
  136. package/lib/test/unit/pdf_find_controller_spec.js +55 -86
  137. package/lib/test/unit/pdf_find_utils_spec.js +32 -32
  138. package/lib/test/unit/pdf_history_spec.js +32 -32
  139. package/lib/test/unit/primitives_spec.js +337 -156
  140. package/lib/test/unit/stream_spec.js +16 -14
  141. package/lib/test/unit/test_utils.js +91 -304
  142. package/lib/test/unit/testreporter.js +33 -22
  143. package/lib/test/unit/type1_parser_spec.js +42 -42
  144. package/lib/test/unit/ui_utils_spec.js +299 -461
  145. package/lib/test/unit/unicode_spec.js +42 -42
  146. package/lib/test/unit/util_spec.js +129 -149
  147. package/lib/test/unit/writer_spec.js +84 -0
  148. package/lib/web/annotation_layer_builder.js +78 -111
  149. package/lib/web/app.js +1542 -1267
  150. package/lib/web/app_options.js +76 -91
  151. package/lib/web/base_tree_viewer.js +100 -0
  152. package/lib/web/base_viewer.js +869 -834
  153. package/lib/web/chromecom.js +165 -252
  154. package/lib/web/debugger.js +149 -205
  155. package/lib/web/download_manager.js +34 -58
  156. package/lib/web/firefox_print_service.js +62 -34
  157. package/lib/web/firefoxcom.js +206 -374
  158. package/lib/web/genericcom.js +26 -108
  159. package/lib/web/genericl10n.js +24 -153
  160. package/lib/web/grab_to_pan.js +30 -30
  161. package/lib/web/interfaces.js +80 -254
  162. package/lib/web/overlay_manager.js +70 -246
  163. package/lib/web/password_prompt.js +38 -64
  164. package/lib/web/pdf_attachment_viewer.js +150 -126
  165. package/lib/web/pdf_cursor_tools.js +75 -102
  166. package/lib/web/pdf_document_properties.js +229 -383
  167. package/lib/web/pdf_find_bar.js +136 -170
  168. package/lib/web/pdf_find_controller.js +492 -548
  169. package/lib/web/pdf_find_utils.js +13 -13
  170. package/lib/web/pdf_history.js +397 -406
  171. package/lib/web/pdf_layer_viewer.js +208 -0
  172. package/lib/web/pdf_link_service.js +304 -348
  173. package/lib/web/pdf_outline_viewer.js +119 -212
  174. package/lib/web/pdf_page_view.js +474 -513
  175. package/lib/web/pdf_presentation_mode.js +308 -357
  176. package/lib/web/pdf_print_service.js +96 -110
  177. package/lib/web/pdf_rendering_queue.js +87 -108
  178. package/lib/web/pdf_sidebar.js +286 -302
  179. package/lib/web/pdf_sidebar_resizer.js +92 -119
  180. package/lib/web/pdf_single_page_viewer.js +77 -126
  181. package/lib/web/pdf_thumbnail_view.js +289 -297
  182. package/lib/web/pdf_thumbnail_viewer.js +202 -206
  183. package/lib/web/pdf_viewer.component.js +20 -21
  184. package/lib/web/pdf_viewer.js +55 -115
  185. package/lib/web/preferences.js +69 -273
  186. package/lib/web/secondary_toolbar.js +164 -196
  187. package/lib/web/text_layer_builder.js +284 -319
  188. package/lib/web/toolbar.js +217 -210
  189. package/lib/web/ui_utils.js +274 -421
  190. package/lib/web/view_history.js +52 -226
  191. package/lib/web/viewer_compatibility.js +21 -6
  192. package/package.json +4 -9
  193. package/types/display/annotation_layer.d.ts +61 -0
  194. package/types/display/annotation_storage.d.ts +36 -0
  195. package/types/display/api.d.ts +1107 -0
  196. package/types/display/api_compatibility.d.ts +1 -0
  197. package/types/display/canvas.d.ts +4 -0
  198. package/types/display/content_disposition.d.ts +7 -0
  199. package/types/display/display_utils.d.ts +243 -0
  200. package/types/display/fetch_stream.d.ts +67 -0
  201. package/types/display/font_loader.d.ts +19 -0
  202. package/types/display/metadata.d.ts +9 -0
  203. package/types/display/network.d.ts +80 -0
  204. package/types/display/network_utils.d.ts +14 -0
  205. package/types/display/node_stream.d.ts +72 -0
  206. package/types/display/node_utils.d.ts +6 -0
  207. package/types/display/optional_content_config.d.ts +12 -0
  208. package/types/display/pattern_helper.d.ts +5 -0
  209. package/types/display/svg.d.ts +2 -0
  210. package/types/display/text_layer.d.ts +83 -0
  211. package/types/display/transport_stream.d.ts +57 -0
  212. package/types/display/webgl.d.ts +20 -0
  213. package/types/display/worker_options.d.ts +27 -0
  214. package/types/display/xml_parser.d.ts +35 -0
  215. package/types/pdf.d.ts +33 -0
  216. package/types/shared/compatibility.d.ts +1 -0
  217. package/types/shared/is_node.d.ts +1 -0
  218. package/types/shared/message_handler.d.ts +62 -0
  219. package/types/shared/util.d.ts +421 -0
  220. package/web/images/shadow.png +0 -0
  221. package/web/pdf_viewer.css +29 -27
  222. package/web/pdf_viewer.js +3524 -4746
  223. package/web/pdf_viewer.js.map +1 -1
  224. package/webpack.js +6 -5
  225. package/external/streams/streams-lib.js +0 -3962
  226. package/external/url/url-lib.js +0 -627
  227. package/lib/shared/streams_polyfill.js +0 -43
  228. package/lib/shared/url_polyfill.js +0 -56
  229. package/web/images/texture.png +0 -0
@@ -2,7 +2,7 @@
2
2
  * @licstart The following is the entire license notice for the
3
3
  * Javascript code in this page
4
4
  *
5
- * Copyright 2019 Mozilla Foundation
5
+ * Copyright 2020 Mozilla Foundation
6
6
  *
7
7
  * Licensed under the Apache License, Version 2.0 (the "License");
8
8
  * you may not use this file except in compliance with the License.
@@ -26,131 +26,116 @@ Object.defineProperty(exports, "__esModule", {
26
26
  });
27
27
  exports.MurmurHash3_64 = void 0;
28
28
 
29
- var _util = require("../shared/util");
29
+ var _util = require("../shared/util.js");
30
30
 
31
- function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
32
-
33
- function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
34
-
35
- function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
36
-
37
- var SEED = 0xc3d2e1f0;
38
- var MASK_HIGH = 0xffff0000;
39
- var MASK_LOW = 0xffff;
40
-
41
- var MurmurHash3_64 =
42
- /*#__PURE__*/
43
- function () {
44
- function MurmurHash3_64(seed) {
45
- _classCallCheck(this, MurmurHash3_64);
31
+ const SEED = 0xc3d2e1f0;
32
+ const MASK_HIGH = 0xffff0000;
33
+ const MASK_LOW = 0xffff;
46
34
 
35
+ class MurmurHash3_64 {
36
+ constructor(seed) {
47
37
  this.h1 = seed ? seed & 0xffffffff : SEED;
48
38
  this.h2 = seed ? seed & 0xffffffff : SEED;
49
39
  }
50
40
 
51
- _createClass(MurmurHash3_64, [{
52
- key: "update",
53
- value: function update(input) {
54
- var data, length;
41
+ update(input) {
42
+ let data, length;
55
43
 
56
- if ((0, _util.isString)(input)) {
57
- data = new Uint8Array(input.length * 2);
58
- length = 0;
44
+ if ((0, _util.isString)(input)) {
45
+ data = new Uint8Array(input.length * 2);
46
+ length = 0;
59
47
 
60
- for (var i = 0, ii = input.length; i < ii; i++) {
61
- var code = input.charCodeAt(i);
48
+ for (let i = 0, ii = input.length; i < ii; i++) {
49
+ const code = input.charCodeAt(i);
62
50
 
63
- if (code <= 0xff) {
64
- data[length++] = code;
65
- } else {
66
- data[length++] = code >>> 8;
67
- data[length++] = code & 0xff;
68
- }
51
+ if (code <= 0xff) {
52
+ data[length++] = code;
53
+ } else {
54
+ data[length++] = code >>> 8;
55
+ data[length++] = code & 0xff;
69
56
  }
70
- } else if ((0, _util.isArrayBuffer)(input)) {
71
- data = input;
72
- length = data.byteLength;
73
- } else {
74
- throw new Error('Wrong data format in MurmurHash3_64_update. ' + 'Input must be a string or array.');
75
57
  }
58
+ } else if ((0, _util.isArrayBuffer)(input)) {
59
+ data = input;
60
+ length = data.byteLength;
61
+ } else {
62
+ throw new Error("Wrong data format in MurmurHash3_64_update. " + "Input must be a string or array.");
63
+ }
76
64
 
77
- var blockCounts = length >> 2;
78
- var tailLength = length - blockCounts * 4;
79
- var dataUint32 = new Uint32Array(data.buffer, 0, blockCounts);
80
- var k1 = 0,
81
- k2 = 0;
82
- var h1 = this.h1,
83
- h2 = this.h2;
84
- var C1 = 0xcc9e2d51,
65
+ const blockCounts = length >> 2;
66
+ const tailLength = length - blockCounts * 4;
67
+ const dataUint32 = new Uint32Array(data.buffer, 0, blockCounts);
68
+ let k1 = 0,
69
+ k2 = 0;
70
+ let h1 = this.h1,
71
+ h2 = this.h2;
72
+ const C1 = 0xcc9e2d51,
85
73
  C2 = 0x1b873593;
86
- var C1_LOW = C1 & MASK_LOW,
74
+ const C1_LOW = C1 & MASK_LOW,
87
75
  C2_LOW = C2 & MASK_LOW;
88
76
 
89
- for (var _i = 0; _i < blockCounts; _i++) {
90
- if (_i & 1) {
91
- k1 = dataUint32[_i];
92
- k1 = k1 * C1 & MASK_HIGH | k1 * C1_LOW & MASK_LOW;
93
- k1 = k1 << 15 | k1 >>> 17;
94
- k1 = k1 * C2 & MASK_HIGH | k1 * C2_LOW & MASK_LOW;
95
- h1 ^= k1;
96
- h1 = h1 << 13 | h1 >>> 19;
97
- h1 = h1 * 5 + 0xe6546b64;
98
- } else {
99
- k2 = dataUint32[_i];
100
- k2 = k2 * C1 & MASK_HIGH | k2 * C1_LOW & MASK_LOW;
101
- k2 = k2 << 15 | k2 >>> 17;
102
- k2 = k2 * C2 & MASK_HIGH | k2 * C2_LOW & MASK_LOW;
103
- h2 ^= k2;
104
- h2 = h2 << 13 | h2 >>> 19;
105
- h2 = h2 * 5 + 0xe6546b64;
106
- }
77
+ for (let i = 0; i < blockCounts; i++) {
78
+ if (i & 1) {
79
+ k1 = dataUint32[i];
80
+ k1 = k1 * C1 & MASK_HIGH | k1 * C1_LOW & MASK_LOW;
81
+ k1 = k1 << 15 | k1 >>> 17;
82
+ k1 = k1 * C2 & MASK_HIGH | k1 * C2_LOW & MASK_LOW;
83
+ h1 ^= k1;
84
+ h1 = h1 << 13 | h1 >>> 19;
85
+ h1 = h1 * 5 + 0xe6546b64;
86
+ } else {
87
+ k2 = dataUint32[i];
88
+ k2 = k2 * C1 & MASK_HIGH | k2 * C1_LOW & MASK_LOW;
89
+ k2 = k2 << 15 | k2 >>> 17;
90
+ k2 = k2 * C2 & MASK_HIGH | k2 * C2_LOW & MASK_LOW;
91
+ h2 ^= k2;
92
+ h2 = h2 << 13 | h2 >>> 19;
93
+ h2 = h2 * 5 + 0xe6546b64;
107
94
  }
95
+ }
108
96
 
109
- k1 = 0;
110
-
111
- switch (tailLength) {
112
- case 3:
113
- k1 ^= data[blockCounts * 4 + 2] << 16;
97
+ k1 = 0;
114
98
 
115
- case 2:
116
- k1 ^= data[blockCounts * 4 + 1] << 8;
99
+ switch (tailLength) {
100
+ case 3:
101
+ k1 ^= data[blockCounts * 4 + 2] << 16;
117
102
 
118
- case 1:
119
- k1 ^= data[blockCounts * 4];
120
- k1 = k1 * C1 & MASK_HIGH | k1 * C1_LOW & MASK_LOW;
121
- k1 = k1 << 15 | k1 >>> 17;
122
- k1 = k1 * C2 & MASK_HIGH | k1 * C2_LOW & MASK_LOW;
103
+ case 2:
104
+ k1 ^= data[blockCounts * 4 + 1] << 8;
123
105
 
124
- if (blockCounts & 1) {
125
- h1 ^= k1;
126
- } else {
127
- h2 ^= k1;
128
- }
106
+ case 1:
107
+ k1 ^= data[blockCounts * 4];
108
+ k1 = k1 * C1 & MASK_HIGH | k1 * C1_LOW & MASK_LOW;
109
+ k1 = k1 << 15 | k1 >>> 17;
110
+ k1 = k1 * C2 & MASK_HIGH | k1 * C2_LOW & MASK_LOW;
129
111
 
130
- }
112
+ if (blockCounts & 1) {
113
+ h1 ^= k1;
114
+ } else {
115
+ h2 ^= k1;
116
+ }
131
117
 
132
- this.h1 = h1;
133
- this.h2 = h2;
134
118
  }
135
- }, {
136
- key: "hexdigest",
137
- value: function hexdigest() {
138
- var h1 = this.h1,
139
- h2 = this.h2;
140
- h1 ^= h2 >>> 1;
141
- h1 = h1 * 0xed558ccd & MASK_HIGH | h1 * 0x8ccd & MASK_LOW;
142
- h2 = h2 * 0xff51afd7 & MASK_HIGH | ((h2 << 16 | h1 >>> 16) * 0xafd7ed55 & MASK_HIGH) >>> 16;
143
- h1 ^= h2 >>> 1;
144
- h1 = h1 * 0x1a85ec53 & MASK_HIGH | h1 * 0xec53 & MASK_LOW;
145
- h2 = h2 * 0xc4ceb9fe & MASK_HIGH | ((h2 << 16 | h1 >>> 16) * 0xb9fe1a85 & MASK_HIGH) >>> 16;
146
- h1 ^= h2 >>> 1;
147
- var hex1 = (h1 >>> 0).toString(16),
119
+
120
+ this.h1 = h1;
121
+ this.h2 = h2;
122
+ }
123
+
124
+ hexdigest() {
125
+ let h1 = this.h1,
126
+ h2 = this.h2;
127
+ h1 ^= h2 >>> 1;
128
+ h1 = h1 * 0xed558ccd & MASK_HIGH | h1 * 0x8ccd & MASK_LOW;
129
+ h2 = h2 * 0xff51afd7 & MASK_HIGH | ((h2 << 16 | h1 >>> 16) * 0xafd7ed55 & MASK_HIGH) >>> 16;
130
+ h1 ^= h2 >>> 1;
131
+ h1 = h1 * 0x1a85ec53 & MASK_HIGH | h1 * 0xec53 & MASK_LOW;
132
+ h2 = h2 * 0xc4ceb9fe & MASK_HIGH | ((h2 << 16 | h1 >>> 16) * 0xb9fe1a85 & MASK_HIGH) >>> 16;
133
+ h1 ^= h2 >>> 1;
134
+ const hex1 = (h1 >>> 0).toString(16),
148
135
  hex2 = (h2 >>> 0).toString(16);
149
- return hex1.padStart(8, '0') + hex2.padStart(8, '0');
150
- }
151
- }]);
136
+ return hex1.padStart(8, "0") + hex2.padStart(8, "0");
137
+ }
152
138
 
153
- return MurmurHash3_64;
154
- }();
139
+ }
155
140
 
156
141
  exports.MurmurHash3_64 = MurmurHash3_64;