postext 1.70.6 → 1.71.0

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.
Files changed (227) hide show
  1. package/README.md +1 -0
  2. package/dist/__tests__/exports.test.js +6 -0
  3. package/dist/__tests__/exports.test.js.map +1 -1
  4. package/dist/__tests__/fonts/strikeout.test.d.ts +2 -0
  5. package/dist/__tests__/fonts/strikeout.test.d.ts.map +1 -0
  6. package/dist/__tests__/fonts/strikeout.test.js +106 -0
  7. package/dist/__tests__/fonts/strikeout.test.js.map +1 -0
  8. package/dist/__tests__/paint/canvasFormFields.test.d.ts +2 -0
  9. package/dist/__tests__/paint/canvasFormFields.test.d.ts.map +1 -0
  10. package/dist/__tests__/paint/canvasFormFields.test.js +89 -0
  11. package/dist/__tests__/paint/canvasFormFields.test.js.map +1 -0
  12. package/dist/__tests__/paint/strikethrough.test.d.ts +2 -0
  13. package/dist/__tests__/paint/strikethrough.test.d.ts.map +1 -0
  14. package/dist/__tests__/paint/strikethrough.test.js +177 -0
  15. package/dist/__tests__/paint/strikethrough.test.js.map +1 -0
  16. package/dist/__tests__/parse/formFields.test.d.ts +2 -0
  17. package/dist/__tests__/parse/formFields.test.d.ts.map +1 -0
  18. package/dist/__tests__/parse/formFields.test.js +107 -0
  19. package/dist/__tests__/parse/formFields.test.js.map +1 -0
  20. package/dist/__tests__/parse/strikethrough.test.d.ts +2 -0
  21. package/dist/__tests__/parse/strikethrough.test.d.ts.map +1 -0
  22. package/dist/__tests__/parse/strikethrough.test.js +97 -0
  23. package/dist/__tests__/parse/strikethrough.test.js.map +1 -0
  24. package/dist/__tests__/pipeline/callouts/calloutHangingIndent.test.d.ts +2 -0
  25. package/dist/__tests__/pipeline/callouts/calloutHangingIndent.test.d.ts.map +1 -0
  26. package/dist/__tests__/pipeline/callouts/calloutHangingIndent.test.js +139 -0
  27. package/dist/__tests__/pipeline/callouts/calloutHangingIndent.test.js.map +1 -0
  28. package/dist/canvas-backend/chip.d.ts +4 -0
  29. package/dist/canvas-backend/chip.d.ts.map +1 -1
  30. package/dist/canvas-backend/chip.js +33 -1
  31. package/dist/canvas-backend/chip.js.map +1 -1
  32. package/dist/canvas-backend/index.d.ts +5 -0
  33. package/dist/canvas-backend/index.d.ts.map +1 -1
  34. package/dist/canvas-backend/index.js +5 -1
  35. package/dist/canvas-backend/index.js.map +1 -1
  36. package/dist/defaults/boxes/calloutStyles/resolve.d.ts.map +1 -1
  37. package/dist/defaults/boxes/calloutStyles/resolve.js +4 -0
  38. package/dist/defaults/boxes/calloutStyles/resolve.js.map +1 -1
  39. package/dist/defaults/boxes/calloutStyles/strip.d.ts.map +1 -1
  40. package/dist/defaults/boxes/calloutStyles/strip.js +2 -0
  41. package/dist/defaults/boxes/calloutStyles/strip.js.map +1 -1
  42. package/dist/fonts/glyphFallback.d.ts +2 -1
  43. package/dist/fonts/glyphFallback.d.ts.map +1 -1
  44. package/dist/fonts/glyphFallback.js +6 -1
  45. package/dist/fonts/glyphFallback.js.map +1 -1
  46. package/dist/fonts/strikeout.d.ts +22 -0
  47. package/dist/fonts/strikeout.d.ts.map +1 -0
  48. package/dist/fonts/strikeout.js +95 -0
  49. package/dist/fonts/strikeout.js.map +1 -0
  50. package/dist/html-backend/lines.d.ts.map +1 -1
  51. package/dist/html-backend/lines.js +8 -0
  52. package/dist/html-backend/lines.js.map +1 -1
  53. package/dist/html-backend/resources.js +3 -3
  54. package/dist/html-backend/resources.js.map +1 -1
  55. package/dist/html-backend/segmentText.d.ts +5 -0
  56. package/dist/html-backend/segmentText.d.ts.map +1 -1
  57. package/dist/html-backend/segmentText.js +7 -0
  58. package/dist/html-backend/segmentText.js.map +1 -1
  59. package/dist/html-backend/segments.js +3 -3
  60. package/dist/html-backend/segments.js.map +1 -1
  61. package/dist/html-backend/vertical.d.ts.map +1 -1
  62. package/dist/html-backend/vertical.js +3 -1
  63. package/dist/html-backend/vertical.js.map +1 -1
  64. package/dist/hyphenation/locale.d.ts +5 -0
  65. package/dist/hyphenation/locale.d.ts.map +1 -1
  66. package/dist/hyphenation/locale.js +8 -0
  67. package/dist/hyphenation/locale.js.map +1 -1
  68. package/dist/idml/colours.d.ts +14 -0
  69. package/dist/idml/colours.d.ts.map +1 -0
  70. package/dist/idml/colours.js +53 -0
  71. package/dist/idml/colours.js.map +1 -0
  72. package/dist/idml/fields.d.ts +19 -0
  73. package/dist/idml/fields.d.ts.map +1 -0
  74. package/dist/idml/fields.js +76 -0
  75. package/dist/idml/fields.js.map +1 -0
  76. package/dist/idml/fonts.d.ts +12 -0
  77. package/dist/idml/fonts.d.ts.map +1 -0
  78. package/dist/idml/fonts.js +19 -0
  79. package/dist/idml/fonts.js.map +1 -0
  80. package/dist/idml/geometry.d.ts +25 -0
  81. package/dist/idml/geometry.d.ts.map +1 -0
  82. package/dist/idml/geometry.js +37 -0
  83. package/dist/idml/geometry.js.map +1 -0
  84. package/dist/idml/idml.test.d.ts +2 -0
  85. package/dist/idml/idml.test.d.ts.map +1 -0
  86. package/dist/idml/idml.test.js +494 -0
  87. package/dist/idml/idml.test.js.map +1 -0
  88. package/dist/idml/images.d.ts +6 -0
  89. package/dist/idml/images.d.ts.map +1 -0
  90. package/dist/idml/images.js +75 -0
  91. package/dist/idml/images.js.map +1 -0
  92. package/dist/idml/index.d.ts +5 -0
  93. package/dist/idml/index.d.ts.map +1 -0
  94. package/dist/idml/index.js +100 -0
  95. package/dist/idml/index.js.map +1 -0
  96. package/dist/idml/paragraphs.d.ts +33 -0
  97. package/dist/idml/paragraphs.d.ts.map +1 -0
  98. package/dist/idml/paragraphs.js +203 -0
  99. package/dist/idml/paragraphs.js.map +1 -0
  100. package/dist/idml/parts.d.ts +89 -0
  101. package/dist/idml/parts.d.ts.map +1 -0
  102. package/dist/idml/parts.js +136 -0
  103. package/dist/idml/parts.js.map +1 -0
  104. package/dist/idml/shapes.d.ts +21 -0
  105. package/dist/idml/shapes.d.ts.map +1 -0
  106. package/dist/idml/shapes.js +146 -0
  107. package/dist/idml/shapes.js.map +1 -0
  108. package/dist/idml/spreads.d.ts +5 -0
  109. package/dist/idml/spreads.d.ts.map +1 -0
  110. package/dist/idml/spreads.js +154 -0
  111. package/dist/idml/spreads.js.map +1 -0
  112. package/dist/idml/story.d.ts +13 -0
  113. package/dist/idml/story.d.ts.map +1 -0
  114. package/dist/idml/story.js +238 -0
  115. package/dist/idml/story.js.map +1 -0
  116. package/dist/idml/writer.d.ts +86 -0
  117. package/dist/idml/writer.d.ts.map +1 -0
  118. package/dist/idml/writer.js +8 -0
  119. package/dist/idml/writer.js.map +1 -0
  120. package/dist/index.d.ts +4 -4
  121. package/dist/index.d.ts.map +1 -1
  122. package/dist/index.js +2 -2
  123. package/dist/index.js.map +1 -1
  124. package/dist/marks/strikeGeometry.d.ts +9 -0
  125. package/dist/marks/strikeGeometry.d.ts.map +1 -0
  126. package/dist/marks/strikeGeometry.js +9 -0
  127. package/dist/marks/strikeGeometry.js.map +1 -0
  128. package/dist/marks/strikethrough.d.ts +41 -0
  129. package/dist/marks/strikethrough.d.ts.map +1 -0
  130. package/dist/marks/strikethrough.js +189 -0
  131. package/dist/marks/strikethrough.js.map +1 -0
  132. package/dist/measure/cache.d.ts.map +1 -1
  133. package/dist/measure/cache.js +8 -2
  134. package/dist/measure/cache.js.map +1 -1
  135. package/dist/measure/links.d.ts.map +1 -1
  136. package/dist/measure/links.js +46 -5
  137. package/dist/measure/links.js.map +1 -1
  138. package/dist/measure/rich/chips.d.ts.map +1 -1
  139. package/dist/measure/rich/chips.js +64 -0
  140. package/dist/measure/rich/chips.js.map +1 -1
  141. package/dist/paint/displayList/blocks.d.ts.map +1 -1
  142. package/dist/paint/displayList/blocks.js +2 -0
  143. package/dist/paint/displayList/blocks.js.map +1 -1
  144. package/dist/paint/displayList/displayList.test.js +22 -0
  145. package/dist/paint/displayList/displayList.test.js.map +1 -1
  146. package/dist/paint/displayList/inline.d.ts.map +1 -1
  147. package/dist/paint/displayList/inline.js +2 -1
  148. package/dist/paint/displayList/inline.js.map +1 -1
  149. package/dist/paint/displayList/lines.d.ts.map +1 -1
  150. package/dist/paint/displayList/lines.js +18 -0
  151. package/dist/paint/displayList/lines.js.map +1 -1
  152. package/dist/paint/displayList/page.d.ts.map +1 -1
  153. package/dist/paint/displayList/page.js +6 -2
  154. package/dist/paint/displayList/page.js.map +1 -1
  155. package/dist/paint/displayList/types.d.ts +22 -3
  156. package/dist/paint/displayList/types.d.ts.map +1 -1
  157. package/dist/parse/formFields.d.ts +118 -0
  158. package/dist/parse/formFields.d.ts.map +1 -0
  159. package/dist/parse/formFields.js +156 -0
  160. package/dist/parse/formFields.js.map +1 -0
  161. package/dist/parse/index.d.ts +2 -0
  162. package/dist/parse/index.d.ts.map +1 -1
  163. package/dist/parse/index.js +1 -0
  164. package/dist/parse/index.js.map +1 -1
  165. package/dist/parse/injectSpans.d.ts +2 -1
  166. package/dist/parse/injectSpans.d.ts.map +1 -1
  167. package/dist/parse/injectSpans.js +16 -2
  168. package/dist/parse/injectSpans.js.map +1 -1
  169. package/dist/parse/inlineFormatting/inlineDirectives.d.ts +3 -0
  170. package/dist/parse/inlineFormatting/inlineDirectives.d.ts.map +1 -1
  171. package/dist/parse/inlineFormatting/inlineDirectives.js +6 -1
  172. package/dist/parse/inlineFormatting/inlineDirectives.js.map +1 -1
  173. package/dist/parse/inlineFormatting/markup.d.ts +21 -1
  174. package/dist/parse/inlineFormatting/markup.d.ts.map +1 -1
  175. package/dist/parse/inlineFormatting/markup.js +25 -1
  176. package/dist/parse/inlineFormatting/markup.js.map +1 -1
  177. package/dist/parse/inlineFormatting/parse.d.ts +1 -1
  178. package/dist/parse/inlineFormatting/parse.d.ts.map +1 -1
  179. package/dist/parse/inlineFormatting/parse.js +38 -6
  180. package/dist/parse/inlineFormatting/parse.js.map +1 -1
  181. package/dist/parse/types/inlineSpan.d.ts +13 -1
  182. package/dist/parse/types/inlineSpan.d.ts.map +1 -1
  183. package/dist/pipeline/build/drivers.d.ts.map +1 -1
  184. package/dist/pipeline/build/drivers.js +3 -0
  185. package/dist/pipeline/build/drivers.js.map +1 -1
  186. package/dist/pipeline/callouts/calloutLayout/plan.d.ts.map +1 -1
  187. package/dist/pipeline/callouts/calloutLayout/plan.js +14 -1
  188. package/dist/pipeline/callouts/calloutLayout/plan.js.map +1 -1
  189. package/dist/pipeline/references/linkNotes.js +1 -1
  190. package/dist/pipeline/references/linkNotes.js.map +1 -1
  191. package/dist/pipeline/styles.d.ts.map +1 -1
  192. package/dist/pipeline/styles.js +20 -12
  193. package/dist/pipeline/styles.js.map +1 -1
  194. package/dist/pipeline/text/tabs.js +1 -1
  195. package/dist/pipeline/text/tabs.js.map +1 -1
  196. package/dist/types/boxes/calloutParts.d.ts +21 -0
  197. package/dist/types/boxes/calloutParts.d.ts.map +1 -1
  198. package/dist/types/boxes/callouts.d.ts +6 -0
  199. package/dist/types/boxes/callouts.d.ts.map +1 -1
  200. package/dist/types/text/bodyText/resolved.d.ts +6 -0
  201. package/dist/types/text/bodyText/resolved.d.ts.map +1 -1
  202. package/dist/vdt/segments.d.ts +31 -0
  203. package/dist/vdt/segments.d.ts.map +1 -1
  204. package/dist/vdt.d.ts +1 -1
  205. package/dist/vdt.d.ts.map +1 -1
  206. package/dist/word/formatted/runs.d.ts.map +1 -1
  207. package/dist/word/formatted/runs.js +4 -2
  208. package/dist/word/formatted/runs.js.map +1 -1
  209. package/dist/word/semantic/boxHangingIndent.test.d.ts +2 -0
  210. package/dist/word/semantic/boxHangingIndent.test.d.ts.map +1 -0
  211. package/dist/word/semantic/boxHangingIndent.test.js +38 -0
  212. package/dist/word/semantic/boxHangingIndent.test.js.map +1 -0
  213. package/dist/word/semantic/inline.d.ts.map +1 -1
  214. package/dist/word/semantic/inline.js +5 -2
  215. package/dist/word/semantic/inline.js.map +1 -1
  216. package/dist/word/semantic/prose/paragraphStyle.d.ts +8 -1
  217. package/dist/word/semantic/prose/paragraphStyle.d.ts.map +1 -1
  218. package/dist/word/semantic/prose/paragraphStyle.js +19 -0
  219. package/dist/word/semantic/prose/paragraphStyle.js.map +1 -1
  220. package/dist/word/semantic/strikethrough.test.d.ts +2 -0
  221. package/dist/word/semantic/strikethrough.test.d.ts.map +1 -0
  222. package/dist/word/semantic/strikethrough.test.js +17 -0
  223. package/dist/word/semantic/strikethrough.test.js.map +1 -0
  224. package/dist/word/semantic/styles.d.ts.map +1 -1
  225. package/dist/word/semantic/styles.js +2 -2
  226. package/dist/word/semantic/styles.js.map +1 -1
  227. package/package.json +5 -1
@@ -0,0 +1,107 @@
1
+ import { describe, it, expect } from 'vitest';
2
+ import { formatFieldNumber, formNumberStyle, numberFieldText, documentLanguageOf } from '../../index.js';
3
+ import { formFieldFromAttrs, formatFieldCalc, parseFieldCalc } from '../../parse/formFields.js';
4
+ // #1445: the number rule every output shares (the PDF's printed values and
5
+ // its widgets' appearance, the canvas preview, writers of the display list).
6
+ const de = formNumberStyle(undefined, 'de-DE');
7
+ const en = formNumberStyle(undefined, 'en-US');
8
+ describe('form field attributes (#1445)', () => {
9
+ it('reads the kind, format, calculation and flags', () => {
10
+ expect(formFieldFromAttrs({ field: 'order.total', format: 'currency', calc: 'sum(a, b)' })).toEqual({
11
+ name: 'order.total', kind: 'number', format: 'currency', calc: { op: 'sum', args: ['a', 'b'], fields: ['a', 'b'] }, readonly: true,
12
+ });
13
+ expect(formFieldFromAttrs({ field: 'size', kind: 'choice', options: 'S | M | L', required: '' })).toEqual({
14
+ name: 'size', kind: 'choice', options: ['S', 'M', 'L'], required: true,
15
+ });
16
+ expect(formFieldFromAttrs({ style: 'field' })).toBeUndefined();
17
+ expect(parseFieldCalc('divide(a, b)')).toBeUndefined();
18
+ });
19
+ it('reads numbers and nested calculations, and every field they read', () => {
20
+ expect(parseFieldCalc('sum(order.a.total, order.b.total, product(order.fee, 161.75), product(order.wrap, order.wrap.price))')).toEqual({
21
+ op: 'sum',
22
+ args: [
23
+ 'order.a.total',
24
+ 'order.b.total',
25
+ { op: 'product', args: ['order.fee', 161.75] },
26
+ { op: 'product', args: ['order.wrap', 'order.wrap.price'] },
27
+ ],
28
+ fields: ['order.a.total', 'order.b.total', 'order.fee', 'order.wrap', 'order.wrap.price'],
29
+ });
30
+ // A name that has digits stays a name; a bare number, also negative or
31
+ // with a leading point, is a number. A field read twice is listed once.
32
+ expect(parseFieldCalc('product(pkg.1, -2, .5, pkg.1)')).toEqual({ op: 'product', args: ['pkg.1', -2, 0.5, 'pkg.1'], fields: ['pkg.1'] });
33
+ expect(parseFieldCalc(' MAX( a ,min(b, 3) ) ')?.args).toEqual(['a', { op: 'min', args: ['b', 3] }]);
34
+ // An unknown or empty nested calculation, an unclosed one and trailing
35
+ // text are no calculation.
36
+ for (const bad of ['sum(a, divide(b, 2))', 'sum(a, product())', 'sum(a, product(b, 2)', 'sum(a) b', 'sum(a b(c))', '12.5']) {
37
+ expect(parseFieldCalc(bad)).toBeUndefined();
38
+ }
39
+ });
40
+ it('writes a calculation back as the attribute reads it, numbers and nested calculations in place', () => {
41
+ const calc = parseFieldCalc(' sum( order.a , product(order.fee, 161.75), max(order.b, -2, .5) ) ');
42
+ expect(formatFieldCalc(calc)).toBe('sum(order.a, product(order.fee, 161.75), max(order.b, -2, 0.5))');
43
+ expect(parseFieldCalc(formatFieldCalc(calc))).toEqual(calc);
44
+ // A number JavaScript would write with an exponent is written in digits.
45
+ expect(formatFieldCalc({ op: 'product', args: ['a', 1e-7, 2e21] })).toBe('product(a, 0.0000001, 2000000000000000000000)');
46
+ });
47
+ it('reads the on value of a check box, and of no other kind', () => {
48
+ expect(formFieldFromAttrs({ field: 'order.fee', kind: 'checkbox', on: ' 1 ' })).toEqual({ name: 'order.fee', kind: 'checkbox', on: '1' });
49
+ expect(formFieldFromAttrs({ field: 'order.fee', kind: 'checkbox' })).toEqual({ name: 'order.fee', kind: 'checkbox' });
50
+ expect(formFieldFromAttrs({ field: 'note', on: '1' })).toEqual({ name: 'note', kind: 'text' });
51
+ });
52
+ });
53
+ describe('number style (#1445)', () => {
54
+ it('takes the separators from the document language, options overriding', () => {
55
+ expect(de).toEqual({ currency: '€', currencyBefore: true, separatorStyle: 2 });
56
+ expect(en.separatorStyle).toBe(0);
57
+ expect(formNumberStyle(undefined, undefined).separatorStyle).toBe(0);
58
+ expect(formNumberStyle(undefined, 'de_AT').separatorStyle).toBe(2);
59
+ // A language that only starts like one that writes `1.234,56`.
60
+ expect(formNumberStyle(undefined, 'dsb').separatorStyle).toBe(0);
61
+ expect(formNumberStyle({ separatorStyle: 3, currency: 'CHF', currencyBefore: false }, 'en')).toEqual({ currency: 'CHF', currencyBefore: false, separatorStyle: 3 });
62
+ });
63
+ it('reads the language from the locale, else the hyphenation tag', () => {
64
+ expect(documentLanguageOf({ locale: 'de' })).toBe('de');
65
+ expect(documentLanguageOf({ bodyText: { hyphenation: { locale: 'fr' } } })).toBe('fr');
66
+ expect(documentLanguageOf({ bodyText: { shapingLanguage: 'host', hyphenation: { tag: 'es-ES' } } })).toBe('es-ES');
67
+ expect(documentLanguageOf(undefined)).toBeUndefined();
68
+ });
69
+ });
70
+ describe('formatFieldNumber (#1445)', () => {
71
+ it('writes currency, decimals and integers in the style', () => {
72
+ expect(formatFieldNumber('1234.5', 'currency', de)).toBe('€ 1.234,50');
73
+ expect(formatFieldNumber('1234.5', 'currency', en)).toBe('€ 1,234.50');
74
+ expect(formatFieldNumber('1234.5', 'currency', { ...de, currencyBefore: false })).toBe('1.234,50 €');
75
+ expect(formatFieldNumber('1234,5', 'decimal', de)).toBe('1.234,50');
76
+ expect(formatFieldNumber('1234', 'integer', en)).toBe('1,234');
77
+ expect(formatFieldNumber('1234.56', 'decimal', { ...en, separatorStyle: 1 })).toBe('1234.56');
78
+ expect(formatFieldNumber('1234.56', 'decimal', { ...en, separatorStyle: 3 })).toBe('1234,56');
79
+ });
80
+ it('reads a value written either way', () => {
81
+ for (const raw of ['1234.5', '1234,5', '1.234,50', '1,234.50', ' 1 234,50 ']) {
82
+ expect(formatFieldNumber(raw, 'decimal', de)).toBe('1.234,50');
83
+ }
84
+ // Three digits after the only mark: thousands.
85
+ expect(formatFieldNumber('1.234', 'integer', de)).toBe('1.234');
86
+ expect(formatFieldNumber('-12,5', 'currency', de)).toBe('-€ 12,50');
87
+ expect(formatFieldNumber('-1234', 'decimal', en)).toBe('-1,234.00');
88
+ expect(formatFieldNumber('-0.4', 'integer', en)).toBe('0');
89
+ });
90
+ it('leaves text, an empty value and a percent alone', () => {
91
+ expect(formatFieldNumber('n/a', 'currency', de)).toBeUndefined();
92
+ expect(formatFieldNumber('', 'currency', de)).toBeUndefined();
93
+ expect(formatFieldNumber('12', 'percent', de)).toBeUndefined();
94
+ expect(formatFieldNumber('12', undefined, de)).toBeUndefined();
95
+ });
96
+ });
97
+ describe('numberFieldText (#1445)', () => {
98
+ it('shows a number field formatted, else as typed; other fields not', () => {
99
+ expect(numberFieldText({ name: 'p', kind: 'number', format: 'currency' }, ' 120 ', de)).toBe('€ 120,00');
100
+ expect(numberFieldText({ name: 'q', kind: 'number' }, ' 3 ', de)).toBe('3');
101
+ expect(numberFieldText({ name: 'q', kind: 'number', format: 'currency' }, 'tbd', de)).toBe('tbd');
102
+ expect(numberFieldText({ name: 'q', kind: 'number', format: 'currency' }, ' ', de)).toBeUndefined();
103
+ expect(numberFieldText({ name: 'n', kind: 'text' }, '120', de)).toBeUndefined();
104
+ expect(numberFieldText(undefined, '120', de)).toBeUndefined();
105
+ });
106
+ });
107
+ //# sourceMappingURL=formFields.test.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"formFields.test.js","sourceRoot":"","sources":["../../../src/__tests__/parse/formFields.test.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,2 @@
1
+ export {};
2
+ //# sourceMappingURL=strikethrough.test.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"strikethrough.test.d.ts","sourceRoot":"","sources":["../../../src/__tests__/parse/strikethrough.test.ts"],"names":[],"mappings":""}
@@ -0,0 +1,97 @@
1
+ import { describe, it, expect } from 'vitest';
2
+ import { parseInlineFormatting, stripInlineFormatting } from '../../parse/inlineFormatting.js';
3
+ import { parseMarkdown } from '../../parse/index.js';
4
+ // `~~text~~`: struck-through text (GitHub Flavored Markdown). The text
5
+ // stays ordinary text, its range riding on `InlineSpan.links` with
6
+ // `strike`, as a highlight mark's does; a single `~` pair stays a
7
+ // subscript.
8
+ /** The struck text of `spans`, run by run. */
9
+ function struck(spans) {
10
+ const runs = new Map();
11
+ for (const span of spans) {
12
+ for (const l of span.links ?? []) {
13
+ if (!l.strike)
14
+ continue;
15
+ runs.set(l.strike.id, (runs.get(l.strike.id) ?? '') + span.text.slice(l.start, l.end));
16
+ }
17
+ }
18
+ return [...runs.values()];
19
+ }
20
+ const text = (spans) => spans.map((s) => s.text).join('');
21
+ describe('~~strikethrough~~', () => {
22
+ it('strikes the text between two tildes on each side, the markers dropped', () => {
23
+ const spans = parseInlineFormatting('Widget A: ~~€ 165,–~~ now € 129,–');
24
+ expect(text(spans)).toBe('Widget A: € 165,– now € 129,–');
25
+ expect(struck(spans)).toEqual(['€ 165,–']);
26
+ // Paint only: the spans are those of the text without the marks.
27
+ expect(spans).toHaveLength(1);
28
+ expect(spans[0].links).toEqual([{ start: 10, end: 17, href: '', strike: { id: 0 } }]);
29
+ });
30
+ it('keeps a single tilde pair a subscript, inside a struck run too', () => {
31
+ const sub = parseInlineFormatting('H~2~O');
32
+ expect(sub.map((s) => s.script)).toEqual([undefined, 'sub', undefined]);
33
+ expect(struck(sub)).toEqual([]);
34
+ const both = parseInlineFormatting('~~H~2~O~~ water');
35
+ expect(text(both)).toBe('H2O water');
36
+ expect(both.map((s) => s.script)).toEqual([undefined, 'sub', undefined]);
37
+ expect(struck(both)).toEqual(['H2O']);
38
+ });
39
+ it('spreads over emphasis, links and soft line breaks, and tells runs apart', () => {
40
+ const spans = parseInlineFormatting('~~old **bold** [link](https://example.org) price~~ and ~~two~~');
41
+ expect(text(spans)).toBe('old bold link price and two');
42
+ expect(struck(spans)).toEqual(['old bold link price', 'two']);
43
+ // The link is still a link, and the strike no link.
44
+ const linked = spans.flatMap((s) => (s.links ?? []).filter((l) => !l.strike).map((l) => [s.text.slice(l.start, l.end), l.href]));
45
+ expect(linked).toEqual([['link', 'https://example.org']]);
46
+ expect(struck(parseInlineFormatting('~~over a\nsoft break~~'))).toEqual(['over a\nsoft break']);
47
+ });
48
+ it('nests in emphasis and holds emphasis', () => {
49
+ const spans = parseInlineFormatting('**~~bold struck~~** and ~~*italic*~~');
50
+ expect(spans.filter((s) => s.bold).map((s) => s.text)).toEqual(['bold struck']);
51
+ expect(struck(spans)).toEqual(['bold struck', 'italic']);
52
+ });
53
+ it('strikes nothing between tildes around spaces, rows of three and lone pairs', () => {
54
+ for (const src of ['~~ not struck ~~', '~~~not struck~~~', 'a ~~ b', '~~~~', 'range 3~~5']) {
55
+ expect(struck(parseInlineFormatting(src))).toEqual([]);
56
+ }
57
+ expect(text(parseInlineFormatting('a ~~ b'))).toBe('a ~~ b');
58
+ });
59
+ it('does not run over a blank line', () => {
60
+ expect(struck(parseInlineFormatting('~~one\n\ntwo~~'))).toEqual([]);
61
+ });
62
+ it('sets escaped tildes literally', () => {
63
+ const spans = parseInlineFormatting('\\~\\~not struck\\~\\~');
64
+ expect(text(spans)).toBe('~~not struck~~');
65
+ expect(struck(spans)).toEqual([]);
66
+ });
67
+ it('leaves tildes in inline code and in a link destination alone', () => {
68
+ const [block] = parseMarkdown('`~~code~~` and [home](https://example.org/~~a~~)');
69
+ expect(struck(block.spans)).toEqual([]);
70
+ expect(block.text).toContain('~~code~~');
71
+ });
72
+ it('stripInlineFormatting drops the markers before the subscripts', () => {
73
+ expect(stripInlineFormatting('~~H~2~O~~ and ~~€ 165,–~~')).toBe('H2O and € 165,–');
74
+ });
75
+ it('maps every character of a block back to its source', () => {
76
+ const md = 'Price ~~€ 165,–~~ now **€ 129,–**.';
77
+ const [block] = parseMarkdown(md);
78
+ expect(block.text).toBe('Price € 165,– now € 129,–.');
79
+ const { text: t, sourceMap } = block;
80
+ for (let i = 0; i < t.length; i++) {
81
+ if (t[i] === ' ')
82
+ continue;
83
+ expect(md[sourceMap[i]]).toBe(t[i]);
84
+ }
85
+ });
86
+ it('strikes the text of a heading and of a table cell', () => {
87
+ const blocks = parseMarkdown('# A ~~struck~~ heading\n\n| Item | Price |\n| --- | --- |\n| Widget A | ~~€ 165~~ € 129 |\n');
88
+ expect(struck(blocks[0].spans)).toEqual(['struck']);
89
+ });
90
+ it('reads two subscripts written together as a strikethrough, as GFM does; a word joiner keeps them subscripts', () => {
91
+ expect(struck(parseInlineFormatting('x~i~~j~ and y~k~~l~'))).toEqual(['j and yk']);
92
+ const spans = parseInlineFormatting('x~i~\u2060~j~ and y~k~\u2060~l~');
93
+ expect(struck(spans)).toEqual([]);
94
+ expect(spans.filter((s) => s.script === 'sub').map((s) => s.text)).toEqual(['i', 'j', 'k', 'l']);
95
+ });
96
+ });
97
+ //# sourceMappingURL=strikethrough.test.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"strikethrough.test.js","sourceRoot":"","sources":["../../../src/__tests__/parse/strikethrough.test.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,2 @@
1
+ export {};
2
+ //# sourceMappingURL=calloutHangingIndent.test.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"calloutHangingIndent.test.d.ts","sourceRoot":"","sources":["../../../../src/__tests__/pipeline/callouts/calloutHangingIndent.test.ts"],"names":[],"mappings":""}
@@ -0,0 +1,139 @@
1
+ import { describe, it, expect } from 'vitest';
2
+ import { buildDocument } from '../../../pipeline/index.js';
3
+ import { pageDisplayList } from '../../../paint/displayList/index.js';
4
+ import { resolveCalloutStylesConfig, stripCalloutStylesDefaults } from '../../../defaults/boxes/calloutStyles.js';
5
+ import { resolveBodyTextConfig } from '../../../defaults/text/bodyText.js';
6
+ import { resolveHeadingsConfig } from '../../../defaults/structure/headings.js';
7
+ import { resolveUnorderedListsConfig } from '../../../defaults/text/unorderedLists.js';
8
+ // #1451: a box's `body.hangingIndent` hangs its paragraphs, so a note set
9
+ // `*⇥Note …` keeps its marker at the box's edge and its text, turnovers
10
+ // included, at the hang.
11
+ class StubCtx {
12
+ font = '';
13
+ measureText(s) {
14
+ return { width: s.length * 7 };
15
+ }
16
+ }
17
+ globalThis.OffscreenCanvas = class {
18
+ getContext() {
19
+ return new StubCtx();
20
+ }
21
+ };
22
+ const pt = (value) => ({ value, unit: 'pt' });
23
+ const em = (value) => ({ value, unit: 'em' });
24
+ // 72 dpi: a point is a pixel; every glyph is 7 px wide.
25
+ const HANG = 30;
26
+ const config = (body, bodyText = {}) => ({
27
+ page: { width: pt(300), height: pt(400), dpi: 72, margins: { top: pt(10), bottom: pt(10), left: pt(10), right: pt(10) } },
28
+ layout: { layoutType: 'single' },
29
+ header: { elements: [] },
30
+ footer: { elements: [] },
31
+ bodyText: { fontSize: pt(10), lineHeight: pt(14), firstLineIndent: pt(0), hyphenation: { enabled: false }, avoidRunts: false, ...bodyText },
32
+ calloutStyles: [{ id: 'note', title: '', body: { textAlign: 'left', ...body } }],
33
+ pageTemplates: [{ id: 'notes', frames: [{ name: 'notes', style: 'note', placement: { anchor: { to: 'container', edge: 'top-left' } }, width: pt(200) }] }],
34
+ });
35
+ const NOTE = 'First note that runs on long enough to turn over onto a second and a third line.';
36
+ const SECOND = 'Second note, also long enough to turn over onto a line of its own.';
37
+ // The marker is escaped: `*` and a tab would open a list item.
38
+ const notes = `\\*\t${NOTE}\n\n\\*\\*\\*\\*\t${SECOND}`;
39
+ const hanging = { hangingIndent: pt(HANG), tabStops: [{ position: pt(HANG) }] };
40
+ const frameDoc = (body, text = notes, bodyText) => buildDocument({ markdown: `::::page{template="notes"}\n\n:::frame{slot="notes"}\n\n${text}\n\n:::\n\n::::` }, config(body, bodyText));
41
+ const boxDoc = (body, text = notes, bodyText) => buildDocument({ markdown: `:::callout{type="note"}\n${text}\n:::\n` }, config(body, bodyText));
42
+ const paragraphs = (doc) => [...doc.blocks, ...doc.pages.flatMap((p) => p.floats ?? [])].filter((b) => b.type === 'paragraph');
43
+ // Each line's start, from the box's inner edge (the paragraph's own box).
44
+ const starts = (b) => b.lines.map((l) => l.bbox.x - b.bbox.x);
45
+ describe('calloutStyles[].body.hangingIndent (#1451)', () => {
46
+ it('resolves absent when unset, keeps a length or a flag, and survives the strip', () => {
47
+ const body = resolveBodyTextConfig();
48
+ const ul = resolveUnorderedListsConfig(undefined, body);
49
+ const [none, length, paired, flag] = resolveCalloutStylesConfig([
50
+ { id: 'a' },
51
+ { id: 'b', body: { hangingIndent: pt(HANG) } },
52
+ { id: 'c', body: { hangingIndent: pt(HANG), firstLineIndent: pt(5) } },
53
+ { id: 'd', body: { hangingIndent: true, firstLineIndent: pt(5) } },
54
+ ], body, resolveHeadingsConfig({}), ul);
55
+ expect(none.body.hangingIndent).toBeUndefined();
56
+ expect(none.body.ownFirstLineIndent).toBeUndefined();
57
+ expect(length.body.hangingIndent).toEqual(pt(HANG));
58
+ expect(length.body.ownFirstLineIndent).toBeUndefined();
59
+ expect(paired.body.ownFirstLineIndent).toBe(true);
60
+ expect(flag.body.hangingIndent).toBe(true);
61
+ // A flag has no first line of its own to pair: the indent is the hang.
62
+ expect(flag.body.ownFirstLineIndent).toBeUndefined();
63
+ expect(stripCalloutStylesDefaults([{ id: 'b', body: { hangingIndent: pt(HANG) } }, { id: 'd', body: { hangingIndent: false } }]))
64
+ .toEqual([{ id: 'b', body: { hangingIndent: pt(HANG) } }, { id: 'd', body: { hangingIndent: false } }]);
65
+ });
66
+ it('a frame hangs its notes: the marker at the edge, the text and its turnovers at the hang', () => {
67
+ const [first, second] = paragraphs(frameDoc(hanging));
68
+ expect(first.lines.length).toBeGreaterThan(2);
69
+ expect(second.lines.length).toBeGreaterThan(1);
70
+ for (const p of [first, second]) {
71
+ const [head, ...rest] = starts(p);
72
+ expect(head).toBeCloseTo(0, 6);
73
+ for (const x of rest)
74
+ expect(x).toBeCloseTo(HANG, 6);
75
+ }
76
+ });
77
+ it('without it the frame sets the notes flush, as before', () => {
78
+ const [first] = paragraphs(frameDoc({ tabStops: [{ position: pt(HANG) }] }));
79
+ for (const x of starts(first))
80
+ expect(x).toBeCloseTo(0, 6);
81
+ });
82
+ it('a tab stop at the hang puts the first line’s text on the turnovers’ edge (display list)', () => {
83
+ const doc = frameDoc(hanging);
84
+ const pageIndex = doc.pages.findIndex((p) => p.composed);
85
+ const [first, second] = paragraphs(doc);
86
+ const items = pageDisplayList(doc, pageIndex).items.filter((i) => i.kind === 'text');
87
+ for (const [p, word, marker] of [[first, 'First', '*'], [second, 'Second', '****']]) {
88
+ const item = items.find((i) => i.kind === 'text' && i.lines[0]?.text.includes(word));
89
+ expect(item.kind).toBe('text');
90
+ if (item.kind !== 'text')
91
+ continue;
92
+ const edge = p.bbox.x;
93
+ const [head, turn] = item.lines;
94
+ const markerRun = head.runs.find((r) => r.text === marker);
95
+ const textRun = head.runs.find((r) => r.text.startsWith(word));
96
+ expect(markerRun.x).toBeCloseTo(edge, 6);
97
+ expect(textRun.x).toBeCloseTo(edge + HANG, 6);
98
+ expect(turn.runs[0].x).toBeCloseTo(edge + HANG, 6);
99
+ }
100
+ });
101
+ it('pairs with a first-line indent the style sets itself; an inherited one gives way', () => {
102
+ const [own] = paragraphs(frameDoc({ ...hanging, firstLineIndent: pt(10) }));
103
+ expect(starts(own)[0]).toBeCloseTo(10, 6);
104
+ expect(starts(own)[1]).toBeCloseTo(HANG, 6);
105
+ // The document's first-line indent (1 em) reaches the box unset.
106
+ const [inherited] = paragraphs(frameDoc(hanging, notes, { firstLineIndent: em(1) }));
107
+ expect(starts(inherited)[0]).toBeCloseTo(0, 6);
108
+ expect(starts(inherited)[1]).toBeCloseTo(HANG, 6);
109
+ });
110
+ it('a box in the flow hangs its paragraphs the same way', () => {
111
+ const [first] = paragraphs(boxDoc(hanging));
112
+ const [head, ...rest] = starts(first);
113
+ expect(head).toBeCloseTo(0, 6);
114
+ for (const x of rest)
115
+ expect(x).toBeCloseTo(HANG, 6);
116
+ });
117
+ it('`true` hangs by the first-line indent, as `bodyText.hangingIndent`; `false` unhangs a hanging body', () => {
118
+ const [flag] = paragraphs(frameDoc({ hangingIndent: true, firstLineIndent: pt(20) }));
119
+ expect(starts(flag)[0]).toBeCloseTo(0, 6);
120
+ expect(starts(flag)[1]).toBeCloseTo(20, 6);
121
+ // Before #1451 the flag was not read in a box: the first line took the indent.
122
+ const [plain] = paragraphs(frameDoc({ firstLineIndent: pt(20) }));
123
+ expect(starts(plain)[0]).toBeCloseTo(20, 6);
124
+ expect(starts(plain)[1]).toBeCloseTo(0, 6);
125
+ const [unhung] = paragraphs(frameDoc({ hangingIndent: false, firstLineIndent: pt(20) }, notes, { hangingIndent: true }));
126
+ expect(starts(unhung)[0]).toBeCloseTo(20, 6);
127
+ expect(starts(unhung)[1]).toBeCloseTo(0, 6);
128
+ });
129
+ it('leaves list items and the running text alone', () => {
130
+ const md = `Running text that is long enough to turn over onto a second line of the page, and then some more.\n\n:::callout{type="note"}\n- a list item in the box that is long enough to turn over onto a second line\n:::\n`;
131
+ const doc = buildDocument({ markdown: md }, config(hanging));
132
+ const plain = buildDocument({ markdown: md }, config({}));
133
+ const lines = (d) => [...d.blocks, ...d.pages.flatMap((p) => p.floats ?? [])]
134
+ .filter((b) => b.type === 'paragraph' || b.type === 'listItem')
135
+ .map((b) => b.lines.map((l) => [l.bbox.x, l.text]));
136
+ expect(lines(doc)).toEqual(lines(plain));
137
+ });
138
+ });
139
+ //# sourceMappingURL=calloutHangingIndent.test.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"calloutHangingIndent.test.js","sourceRoot":"","sources":["../../../../src/__tests__/pipeline/callouts/calloutHangingIndent.test.ts"],"names":[],"mappings":"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"}
@@ -1,4 +1,8 @@
1
1
  import type { VDTChip, VDTChipRun } from '../vdt.js';
2
+ import { type FormNumberStyle } from '../parse/formFields.js';
3
+ /** Paint number fields in `style` until the next call; returns the
4
+ * previous style. */
5
+ export declare function setFieldNumberStyle(style: FormNumberStyle): FormNumberStyle;
2
6
  /**
3
7
  * Inline chip (`:chip[…]`): the box — fill, then the outline stroked inside
4
8
  * its edge — and the text runs on the line's baseline. `x` is the segment's
@@ -1 +1 @@
1
- {"version":3,"file":"chip.d.ts","sourceRoot":"","sources":["../../src/canvas-backend/chip.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAuBrD;;;;;;GAMG;AACH;qEACqE;AACrE,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,OAAO,GAAG,QAAQ,GAAG,QAAQ,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,SAAS,CAI1G;AAED,wBAAgB,SAAS,CACvB,GAAG,EAAE,wBAAwB,EAC7B,IAAI,EAAE,OAAO,EACb,CAAC,EAAE,MAAM,EACT,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,CAAC,GAAG,EAAE,UAAU,KAAK,MAAM,GAClC,IAAI,CA8DN"}
1
+ {"version":3,"file":"chip.d.ts","sourceRoot":"","sources":["../../src/canvas-backend/chip.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAOrD,OAAO,EAAoC,KAAK,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAQhG;sBACsB;AACtB,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,eAAe,GAAG,eAAe,CAI3E;AAiBD;;;;;;GAMG;AACH;qEACqE;AACrE,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,OAAO,GAAG,QAAQ,GAAG,QAAQ,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,SAAS,CAI1G;AAED,wBAAgB,SAAS,CACvB,GAAG,EAAE,wBAAwB,EAC7B,IAAI,EAAE,OAAO,EACb,CAAC,EAAE,MAAM,EACT,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,CAAC,GAAG,EAAE,UAAU,KAAK,MAAM,GAClC,IAAI,CAgFN"}
@@ -1,9 +1,22 @@
1
1
  import { joiningScriptIn } from '../measure/rtl/joining.js';
2
2
  import { paintRunInDirection, runPaintOrder } from './runDirection.js';
3
3
  import { letterSpacingOf, restoreContext, saveContext, setLetterSpacing } from './contextState.js';
4
- import { fillContextText } from './contextText.js';
4
+ import { fillContextText, measureContextText } from './contextText.js';
5
5
  import { fillTextDots } from './textDots.js';
6
6
  import { paintChipReadings } from './annotations.js';
7
+ import { formNumberStyle, numberFieldText } from '../parse/formFields.js';
8
+ /** How number fields write their values (#1445): set by
9
+ * `renderPageToCanvas` from the document's language and its `forms`
10
+ * option while it paints a page (painting is synchronous), so the preview
11
+ * shows what the PDF's form does. */
12
+ let fieldNumbers = formNumberStyle(undefined, undefined);
13
+ /** Paint number fields in `style` until the next call; returns the
14
+ * previous style. */
15
+ export function setFieldNumberStyle(style) {
16
+ const previous = fieldNumbers;
17
+ fieldNumbers = style;
18
+ return previous;
19
+ }
7
20
  /** Trace a rounded rect (radius already clamped to half the box). */
8
21
  function roundedRectPath(ctx, x, y, w, h, r) {
9
22
  ctx.beginPath();
@@ -76,6 +89,17 @@ export function paintChip(ctx, chip, x, baseline, inkFor) {
76
89
  return;
77
90
  }
78
91
  ctx.textBaseline = 'alphabetic';
92
+ // A number field (#1445): its value as the PDF's form shows it, in the
93
+ // field's format, set to the box's end.
94
+ const shown = chip.runs[0] ? numberFieldText(chip.field, chip.runs.map((r) => r.text).join(''), fieldNumbers) : undefined;
95
+ if (shown !== undefined) {
96
+ ctx.font = chip.runs[0].fontString;
97
+ ctx.fillStyle = chip.color ?? inkFor(chip.runs[0]);
98
+ const end = bx + chip.boxWidth - chip.borderWidth - (chip.field?.padPx ?? chip.paddingX);
99
+ fillContextText(ctx, shown, end - measureContextText(ctx, shown).width, baseline);
100
+ restoreContext(ctx);
101
+ return;
102
+ }
79
103
  let tx = bx + chip.borderWidth + chip.paddingX;
80
104
  // The block's tracking, which a run of a joining script (measured
81
105
  // untracked, `measure/rtl/joining.ts`) is painted without. It is asked of
@@ -101,6 +125,14 @@ export function paintChip(ctx, chip, x, baseline, inkFor) {
101
125
  setLetterSpacing(ctx, spacing);
102
126
  tx += run.width;
103
127
  }
128
+ // The lines through its struck-through words (`~~…~~`).
129
+ if (chip.strikes && chip.runs[0]) {
130
+ const textX = bx + chip.borderWidth + chip.paddingX;
131
+ // Filled as the line's own marks are (`paintLineMarks`).
132
+ ctx.fillStyle = chip.color ?? inkFor(chip.runs[0]);
133
+ for (const s of chip.strikes)
134
+ ctx.fillRect(textX + s.x, baseline + s.y - s.thickness / 2, s.length, s.thickness);
135
+ }
104
136
  restoreContext(ctx);
105
137
  }
106
138
  //# sourceMappingURL=chip.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"chip.js","sourceRoot":"","sources":["../../src/canvas-backend/chip.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"chip.js","sourceRoot":"","sources":["../../src/canvas-backend/chip.ts"],"names":[],"mappings":"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"}
@@ -1,4 +1,5 @@
1
1
  import type { RenderWarning, VDTDocument, VDTPage } from '../vdt.js';
2
+ import { type FormNumberOptions } from '../parse/formFields.js';
2
3
  import { type PrintPreview } from '../color/softProof.js';
3
4
  export { registerResourceImage, unregisterResourceImage, clearResourceImages, getResourceImage, } from './renderResourceBlock.js';
4
5
  export type { ResourceImageSource, RegisterResourceImageOptions } from './renderResourceBlock.js';
@@ -43,6 +44,10 @@ export interface RenderPageOptions {
43
44
  /** The output the page is painted for, which decides whether its links
44
45
  * take `links.style` (#1402): `'canvas'` (the default) or `'folio'`. */
45
46
  output?: 'canvas' | 'folio';
47
+ /** How form fields write numbers (#1445): the same option as
48
+ * `renderToPdf`'s `forms`, so the preview shows what the PDF's form
49
+ * does. Separators default from the document language. */
50
+ forms?: FormNumberOptions;
46
51
  }
47
52
  /** Paint one page on a canvas the caller already has. */
48
53
  export declare function renderPageToCanvas(page: VDTPage, doc: VDTDocument, canvas: HTMLCanvasElement, options?: RenderPageOptions): void;
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/canvas-backend/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAoBrE,OAAO,EAAe,KAAK,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAGvE,OAAO,EACL,qBAAqB,EACrB,uBAAuB,EACvB,mBAAmB,EACnB,gBAAgB,GACjB,MAAM,0BAA0B,CAAC;AAClC,YAAY,EAAE,mBAAmB,EAAE,4BAA4B,EAAE,MAAM,0BAA0B,CAAC;AAClG,OAAO,EAAE,0BAA0B,EAAE,4BAA4B,EAAE,sBAAsB,EAAE,gBAAgB,EAAE,yBAAyB,EAAE,MAAM,mBAAmB,CAAC;AAClK,YAAY,EAAE,sBAAsB,EAAE,MAAM,mBAAmB,CAAC;AAEhE,+EAA+E;AAC/E,MAAM,WAAW,iBAAiB;IAChC,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB;;;;;;;gBAOY;IACZ,KAAK,CAAC,EAAE,MAAM,CAAC;IACf;;;6CAGyC;IACzC,SAAS,CAAC,EAAE,CAAC,OAAO,EAAE,aAAa,KAAK,IAAI,CAAC;IAC7C;;;;;;;+DAO2D;IAC3D,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB;;;4EAGwE;IACxE,IAAI,CAAC,EAAE,OAAO,CAAC;IACf;;;uEAGmE;IACnE,YAAY,CAAC,EAAE,YAAY,CAAC;IAC5B;6EACyE;IACzE,MAAM,CAAC,EAAE,QAAQ,GAAG,OAAO,CAAC;CAC7B;AAQD,yDAAyD;AACzD,wBAAgB,kBAAkB,CAChC,IAAI,EAAE,OAAO,EACb,GAAG,EAAE,WAAW,EAChB,MAAM,EAAE,iBAAiB,EACzB,OAAO,CAAC,EAAE,iBAAiB,GAC1B,IAAI,CAwBN;AAgWD,sCAAsC;AACtC,wBAAgB,UAAU,CAAC,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,WAAW,EAAE,OAAO,CAAC,EAAE,iBAAiB,GAAG,iBAAiB,CAI1G;AAED,mEAAmE;AACnE,wBAAgB,cAAc,CAAC,GAAG,EAAE,WAAW,EAAE,OAAO,CAAC,EAAE,iBAAiB,GAAG,iBAAiB,EAAE,CAejG"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/canvas-backend/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAYrE,OAAO,EAAmB,KAAK,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAUjF,OAAO,EAAe,KAAK,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAGvE,OAAO,EACL,qBAAqB,EACrB,uBAAuB,EACvB,mBAAmB,EACnB,gBAAgB,GACjB,MAAM,0BAA0B,CAAC;AAClC,YAAY,EAAE,mBAAmB,EAAE,4BAA4B,EAAE,MAAM,0BAA0B,CAAC;AAClG,OAAO,EAAE,0BAA0B,EAAE,4BAA4B,EAAE,sBAAsB,EAAE,gBAAgB,EAAE,yBAAyB,EAAE,MAAM,mBAAmB,CAAC;AAClK,YAAY,EAAE,sBAAsB,EAAE,MAAM,mBAAmB,CAAC;AAEhE,+EAA+E;AAC/E,MAAM,WAAW,iBAAiB;IAChC,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB;;;;;;;gBAOY;IACZ,KAAK,CAAC,EAAE,MAAM,CAAC;IACf;;;6CAGyC;IACzC,SAAS,CAAC,EAAE,CAAC,OAAO,EAAE,aAAa,KAAK,IAAI,CAAC;IAC7C;;;;;;;+DAO2D;IAC3D,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB;;;4EAGwE;IACxE,IAAI,CAAC,EAAE,OAAO,CAAC;IACf;;;uEAGmE;IACnE,YAAY,CAAC,EAAE,YAAY,CAAC;IAC5B;6EACyE;IACzE,MAAM,CAAC,EAAE,QAAQ,GAAG,OAAO,CAAC;IAC5B;;+DAE2D;IAC3D,KAAK,CAAC,EAAE,iBAAiB,CAAC;CAC3B;AAQD,yDAAyD;AACzD,wBAAgB,kBAAkB,CAChC,IAAI,EAAE,OAAO,EACb,GAAG,EAAE,WAAW,EAChB,MAAM,EAAE,iBAAiB,EACzB,OAAO,CAAC,EAAE,iBAAiB,GAC1B,IAAI,CA0BN;AAgWD,sCAAsC;AACtC,wBAAgB,UAAU,CAAC,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,WAAW,EAAE,OAAO,CAAC,EAAE,iBAAiB,GAAG,iBAAiB,CAI1G;AAED,mEAAmE;AACnE,wBAAgB,cAAc,CAAC,GAAG,EAAE,WAAW,EAAE,OAAO,CAAC,EAAE,iBAAiB,GAAG,iBAAiB,EAAE,CAejG"}
@@ -7,7 +7,9 @@ import { cjkGridCells } from '../pipeline/text/cjkGrid.js';
7
7
  import { renderBlock } from './blockRender.js';
8
8
  import { renderHeaderFooterSlot } from './headerFooter.js';
9
9
  import { documentInkHex } from '../svg/singleInk.js';
10
- import { shapingLanguageOf } from '../hyphenation/locale.js';
10
+ import { documentLanguageOf, shapingLanguageOf } from '../hyphenation/locale.js';
11
+ import { setFieldNumberStyle } from './chip.js';
12
+ import { formNumberStyle } from '../parse/formFields.js';
11
13
  import { setSegmentLanguages } from './wordRuns.js';
12
14
  import { setMissingImageSink, setTintUnflagged } from './renderResourceBlock.js';
13
15
  import { restoreLinkPaint, setLinkPaint } from './blockRender/linkPaint.js';
@@ -31,6 +33,7 @@ function trimInset(doc, options) {
31
33
  export function renderPageToCanvas(page, doc, canvas, options) {
32
34
  const previousTint = setTintUnflagged(options?.singleInk === true);
33
35
  const previousLinks = setLinkPaint(doc.config?.links, options?.output ?? 'canvas');
36
+ const previousFields = setFieldNumberStyle(formNumberStyle(options?.forms, documentLanguageOf(doc.config)));
34
37
  try {
35
38
  const onWarning = options?.onWarning;
36
39
  if (!onWarning) {
@@ -54,6 +57,7 @@ export function renderPageToCanvas(page, doc, canvas, options) {
54
57
  finally {
55
58
  setTintUnflagged(previousTint);
56
59
  restoreLinkPaint(previousLinks);
60
+ setFieldNumberStyle(previousFields);
57
61
  }
58
62
  }
59
63
  function paintPage(page, doc, canvas, options) {