Showing
5 changed files
with
66 additions
and
65 deletions
@@ -7,6 +7,7 @@ | @@ -7,6 +7,7 @@ | ||
7 | - Add RTL support [Milad-Akarie] | 7 | - Add RTL support [Milad-Akarie] |
8 | - Fix Arabic fonts missing isolated form [Milad-Akarie] | 8 | - Fix Arabic fonts missing isolated form [Milad-Akarie] |
9 | - Throw multi page error explicitly [Marcin Jeleński] | 9 | - Throw multi page error explicitly [Marcin Jeleński] |
10 | +- Fix deprecations | ||
10 | 11 | ||
11 | ## 3.10.4 | 12 | ## 3.10.4 |
12 | 13 |
@@ -81,7 +81,7 @@ const Map<int, int> basicToIsolatedMappings = { | @@ -81,7 +81,7 @@ const Map<int, int> basicToIsolatedMappings = { | ||
81 | /// Applies THE BIDIRECTIONAL ALGORITHM using (https://pub.dev/packages/bidi) | 81 | /// Applies THE BIDIRECTIONAL ALGORITHM using (https://pub.dev/packages/bidi) |
82 | String logicalToVisual(String input) { | 82 | String logicalToVisual(String input) { |
83 | final buffer = StringBuffer(); | 83 | final buffer = StringBuffer(); |
84 | - final paragraphs = bidi.splitStringToParagraphs(input); | 84 | + final paragraphs = bidi.BidiString.fromLogical(input).paragraphs; |
85 | for (final paragraph in paragraphs) { | 85 | for (final paragraph in paragraphs) { |
86 | final endsWithNewLine = paragraph.separator == 10; | 86 | final endsWithNewLine = paragraph.separator == 10; |
87 | final endIndex = paragraph.bidiText.length - (endsWithNewLine ? 1 : 0); | 87 | final endIndex = paragraph.bidiText.length - (endsWithNewLine ? 1 : 0); |
@@ -132,7 +132,7 @@ class PdfGraphics { | @@ -132,7 +132,7 @@ class PdfGraphics { | ||
132 | void fillPath({bool evenOdd = false}) { | 132 | void fillPath({bool evenOdd = false}) { |
133 | var o = 0; | 133 | var o = 0; |
134 | assert(() { | 134 | assert(() { |
135 | - if (_page.pdfDocument.settings.verbose) { | 135 | + if (_page.settings.verbose) { |
136 | o = _buf.offset; | 136 | o = _buf.offset; |
137 | _buf.putString(' ' * (_indent)); | 137 | _buf.putString(' ' * (_indent)); |
138 | } | 138 | } |
@@ -143,7 +143,7 @@ class PdfGraphics { | @@ -143,7 +143,7 @@ class PdfGraphics { | ||
143 | _page.altered = true; | 143 | _page.altered = true; |
144 | 144 | ||
145 | assert(() { | 145 | assert(() { |
146 | - if (_page.pdfDocument.settings.verbose) { | 146 | + if (_page.settings.verbose) { |
147 | _buf.putString(' ' * math.max(0, _commentIndent - _buf.offset + o)); | 147 | _buf.putString(' ' * math.max(0, _commentIndent - _buf.offset + o)); |
148 | _buf.putComment('fillPath(evenOdd: $evenOdd)'); | 148 | _buf.putComment('fillPath(evenOdd: $evenOdd)'); |
149 | } | 149 | } |
@@ -155,7 +155,7 @@ class PdfGraphics { | @@ -155,7 +155,7 @@ class PdfGraphics { | ||
155 | void strokePath({bool close = false}) { | 155 | void strokePath({bool close = false}) { |
156 | var o = 0; | 156 | var o = 0; |
157 | assert(() { | 157 | assert(() { |
158 | - if (_page.pdfDocument.settings.verbose) { | 158 | + if (_page.settings.verbose) { |
159 | o = _buf.offset; | 159 | o = _buf.offset; |
160 | _buf.putString(' ' * (_indent)); | 160 | _buf.putString(' ' * (_indent)); |
161 | } | 161 | } |
@@ -166,7 +166,7 @@ class PdfGraphics { | @@ -166,7 +166,7 @@ class PdfGraphics { | ||
166 | _page.altered = true; | 166 | _page.altered = true; |
167 | 167 | ||
168 | assert(() { | 168 | assert(() { |
169 | - if (_page.pdfDocument.settings.verbose) { | 169 | + if (_page.settings.verbose) { |
170 | _buf.putString(' ' * math.max(0, _commentIndent - _buf.offset + o)); | 170 | _buf.putString(' ' * math.max(0, _commentIndent - _buf.offset + o)); |
171 | _buf.putComment('strokePath(close: $close)'); | 171 | _buf.putComment('strokePath(close: $close)'); |
172 | } | 172 | } |
@@ -177,7 +177,7 @@ class PdfGraphics { | @@ -177,7 +177,7 @@ class PdfGraphics { | ||
177 | /// Close the path with a line | 177 | /// Close the path with a line |
178 | void closePath() { | 178 | void closePath() { |
179 | assert(() { | 179 | assert(() { |
180 | - if (_page.pdfDocument.settings.verbose) { | 180 | + if (_page.settings.verbose) { |
181 | _buf.putString(' ' * (_indent)); | 181 | _buf.putString(' ' * (_indent)); |
182 | } | 182 | } |
183 | return true; | 183 | return true; |
@@ -187,7 +187,7 @@ class PdfGraphics { | @@ -187,7 +187,7 @@ class PdfGraphics { | ||
187 | _page.altered = true; | 187 | _page.altered = true; |
188 | 188 | ||
189 | assert(() { | 189 | assert(() { |
190 | - if (_page.pdfDocument.settings.verbose) { | 190 | + if (_page.settings.verbose) { |
191 | _buf.putString(' ' * (_commentIndent - 2 - _indent)); | 191 | _buf.putString(' ' * (_commentIndent - 2 - _indent)); |
192 | _buf.putComment('closePath()'); | 192 | _buf.putComment('closePath()'); |
193 | } | 193 | } |
@@ -200,7 +200,7 @@ class PdfGraphics { | @@ -200,7 +200,7 @@ class PdfGraphics { | ||
200 | void clipPath({bool evenOdd = false, bool end = true}) { | 200 | void clipPath({bool evenOdd = false, bool end = true}) { |
201 | var o = 0; | 201 | var o = 0; |
202 | assert(() { | 202 | assert(() { |
203 | - if (_page.pdfDocument.settings.verbose) { | 203 | + if (_page.settings.verbose) { |
204 | o = _buf.offset; | 204 | o = _buf.offset; |
205 | _buf.putString(' ' * (_indent)); | 205 | _buf.putString(' ' * (_indent)); |
206 | } | 206 | } |
@@ -210,7 +210,7 @@ class PdfGraphics { | @@ -210,7 +210,7 @@ class PdfGraphics { | ||
210 | _buf.putString('W${evenOdd ? '*' : ''}${end ? ' n' : ''} '); | 210 | _buf.putString('W${evenOdd ? '*' : ''}${end ? ' n' : ''} '); |
211 | 211 | ||
212 | assert(() { | 212 | assert(() { |
213 | - if (_page.pdfDocument.settings.verbose) { | 213 | + if (_page.settings.verbose) { |
214 | _buf.putString(' ' * math.max(0, _commentIndent - _buf.offset + o)); | 214 | _buf.putString(' ' * math.max(0, _commentIndent - _buf.offset + o)); |
215 | _buf.putComment('clipPath(evenOdd: $evenOdd, end: $end)'); | 215 | _buf.putComment('clipPath(evenOdd: $evenOdd, end: $end)'); |
216 | } | 216 | } |
@@ -223,7 +223,7 @@ class PdfGraphics { | @@ -223,7 +223,7 @@ class PdfGraphics { | ||
223 | void fillAndStrokePath({bool evenOdd = false, bool close = false}) { | 223 | void fillAndStrokePath({bool evenOdd = false, bool close = false}) { |
224 | var o = 0; | 224 | var o = 0; |
225 | assert(() { | 225 | assert(() { |
226 | - if (_page.pdfDocument.settings.verbose) { | 226 | + if (_page.settings.verbose) { |
227 | o = _buf.offset; | 227 | o = _buf.offset; |
228 | _buf.putString(' ' * (_indent)); | 228 | _buf.putString(' ' * (_indent)); |
229 | } | 229 | } |
@@ -234,7 +234,7 @@ class PdfGraphics { | @@ -234,7 +234,7 @@ class PdfGraphics { | ||
234 | _page.altered = true; | 234 | _page.altered = true; |
235 | 235 | ||
236 | assert(() { | 236 | assert(() { |
237 | - if (_page.pdfDocument.settings.verbose) { | 237 | + if (_page.settings.verbose) { |
238 | _buf.putString(' ' * math.max(0, _commentIndent - _buf.offset + o)); | 238 | _buf.putString(' ' * math.max(0, _commentIndent - _buf.offset + o)); |
239 | _buf.putComment('fillAndStrokePath(evenOdd:$evenOdd, close:$close)'); | 239 | _buf.putComment('fillAndStrokePath(evenOdd:$evenOdd, close:$close)'); |
240 | } | 240 | } |
@@ -246,7 +246,7 @@ class PdfGraphics { | @@ -246,7 +246,7 @@ class PdfGraphics { | ||
246 | void applyShader(PdfShading shader) { | 246 | void applyShader(PdfShading shader) { |
247 | var o = 0; | 247 | var o = 0; |
248 | assert(() { | 248 | assert(() { |
249 | - if (_page.pdfDocument.settings.verbose) { | 249 | + if (_page.settings.verbose) { |
250 | o = _buf.offset; | 250 | o = _buf.offset; |
251 | _buf.putString(' ' * (_indent)); | 251 | _buf.putString(' ' * (_indent)); |
252 | } | 252 | } |
@@ -259,7 +259,7 @@ class PdfGraphics { | @@ -259,7 +259,7 @@ class PdfGraphics { | ||
259 | _page.altered = true; | 259 | _page.altered = true; |
260 | 260 | ||
261 | assert(() { | 261 | assert(() { |
262 | - if (_page.pdfDocument.settings.verbose) { | 262 | + if (_page.settings.verbose) { |
263 | _buf.putString(' ' * math.max(0, _commentIndent - _buf.offset + o)); | 263 | _buf.putString(' ' * math.max(0, _commentIndent - _buf.offset + o)); |
264 | _buf.putComment('applyShader(${shader.ref()})'); | 264 | _buf.putComment('applyShader(${shader.ref()})'); |
265 | } | 265 | } |
@@ -276,7 +276,7 @@ class PdfGraphics { | @@ -276,7 +276,7 @@ class PdfGraphics { | ||
276 | if (_contextQueue.isNotEmpty) { | 276 | if (_contextQueue.isNotEmpty) { |
277 | assert(() { | 277 | assert(() { |
278 | _indent -= _indentAmount; | 278 | _indent -= _indentAmount; |
279 | - if (_page.pdfDocument.settings.verbose) { | 279 | + if (_page.settings.verbose) { |
280 | _buf.putString(' ' * (_indent)); | 280 | _buf.putString(' ' * (_indent)); |
281 | } | 281 | } |
282 | return true; | 282 | return true; |
@@ -287,7 +287,7 @@ class PdfGraphics { | @@ -287,7 +287,7 @@ class PdfGraphics { | ||
287 | _context = _contextQueue.removeLast(); | 287 | _context = _contextQueue.removeLast(); |
288 | 288 | ||
289 | assert(() { | 289 | assert(() { |
290 | - if (_page.pdfDocument.settings.verbose) { | 290 | + if (_page.settings.verbose) { |
291 | _buf.putString(' ' * (_commentIndent - 2 - _indent)); | 291 | _buf.putString(' ' * (_commentIndent - 2 - _indent)); |
292 | _buf.putComment('restoreContext()'); | 292 | _buf.putComment('restoreContext()'); |
293 | } | 293 | } |
@@ -299,7 +299,7 @@ class PdfGraphics { | @@ -299,7 +299,7 @@ class PdfGraphics { | ||
299 | /// Save the graphic context | 299 | /// Save the graphic context |
300 | void saveContext() { | 300 | void saveContext() { |
301 | assert(() { | 301 | assert(() { |
302 | - if (_page.pdfDocument.settings.verbose) { | 302 | + if (_page.settings.verbose) { |
303 | _buf.putString(' ' * (_indent)); | 303 | _buf.putString(' ' * (_indent)); |
304 | } | 304 | } |
305 | return true; | 305 | return true; |
@@ -307,7 +307,7 @@ class PdfGraphics { | @@ -307,7 +307,7 @@ class PdfGraphics { | ||
307 | _buf.putString('q '); | 307 | _buf.putString('q '); |
308 | _contextQueue.addLast(_context.copy()); | 308 | _contextQueue.addLast(_context.copy()); |
309 | assert(() { | 309 | assert(() { |
310 | - if (_page.pdfDocument.settings.verbose) { | 310 | + if (_page.settings.verbose) { |
311 | _buf.putString(' ' * (_commentIndent - 2 - _indent)); | 311 | _buf.putString(' ' * (_commentIndent - 2 - _indent)); |
312 | _buf.putComment('saveContext()'); | 312 | _buf.putComment('saveContext()'); |
313 | } | 313 | } |
@@ -320,7 +320,7 @@ class PdfGraphics { | @@ -320,7 +320,7 @@ class PdfGraphics { | ||
320 | void drawImage(PdfImage img, double x, double y, [double? w, double? h]) { | 320 | void drawImage(PdfImage img, double x, double y, [double? w, double? h]) { |
321 | var o = 0; | 321 | var o = 0; |
322 | assert(() { | 322 | assert(() { |
323 | - if (_page.pdfDocument.settings.verbose) { | 323 | + if (_page.settings.verbose) { |
324 | o = _buf.offset; | 324 | o = _buf.offset; |
325 | _buf.putString(' ' * (_indent)); | 325 | _buf.putString(' ' * (_indent)); |
326 | } | 326 | } |
@@ -366,7 +366,7 @@ class PdfGraphics { | @@ -366,7 +366,7 @@ class PdfGraphics { | ||
366 | _page.altered = true; | 366 | _page.altered = true; |
367 | 367 | ||
368 | assert(() { | 368 | assert(() { |
369 | - if (_page.pdfDocument.settings.verbose) { | 369 | + if (_page.settings.verbose) { |
370 | _buf.putString(' ' * math.max(0, _commentIndent - _buf.offset + o)); | 370 | _buf.putString(' ' * math.max(0, _commentIndent - _buf.offset + o)); |
371 | _buf.putComment('drawImage(${img.ref()}, x: $x, y: $y, w: $w, h: $h)'); | 371 | _buf.putComment('drawImage(${img.ref()}, x: $x, y: $y, w: $w, h: $h)'); |
372 | } | 372 | } |
@@ -403,7 +403,7 @@ class PdfGraphics { | @@ -403,7 +403,7 @@ class PdfGraphics { | ||
403 | void drawRect(double x, double y, double w, double h) { | 403 | void drawRect(double x, double y, double w, double h) { |
404 | var o = 0; | 404 | var o = 0; |
405 | assert(() { | 405 | assert(() { |
406 | - if (_page.pdfDocument.settings.verbose) { | 406 | + if (_page.settings.verbose) { |
407 | o = _buf.offset; | 407 | o = _buf.offset; |
408 | _buf.putString(' ' * (_indent)); | 408 | _buf.putString(' ' * (_indent)); |
409 | } | 409 | } |
@@ -414,7 +414,7 @@ class PdfGraphics { | @@ -414,7 +414,7 @@ class PdfGraphics { | ||
414 | _buf.putString(' re '); | 414 | _buf.putString(' re '); |
415 | 415 | ||
416 | assert(() { | 416 | assert(() { |
417 | - if (_page.pdfDocument.settings.verbose) { | 417 | + if (_page.settings.verbose) { |
418 | _buf.putString(' ' * math.max(0, _commentIndent - _buf.offset + o)); | 418 | _buf.putString(' ' * math.max(0, _commentIndent - _buf.offset + o)); |
419 | _buf.putComment('drawRect(x: $x, y: $y, w: $w, h: $h)'); | 419 | _buf.putComment('drawRect(x: $x, y: $y, w: $w, h: $h)'); |
420 | } | 420 | } |
@@ -453,7 +453,7 @@ class PdfGraphics { | @@ -453,7 +453,7 @@ class PdfGraphics { | ||
453 | }) { | 453 | }) { |
454 | var o = 0; | 454 | var o = 0; |
455 | assert(() { | 455 | assert(() { |
456 | - if (_page.pdfDocument.settings.verbose) { | 456 | + if (_page.settings.verbose) { |
457 | o = _buf.offset; | 457 | o = _buf.offset; |
458 | _buf.putString(' ' * (_indent)); | 458 | _buf.putString(' ' * (_indent)); |
459 | } | 459 | } |
@@ -486,7 +486,7 @@ class PdfGraphics { | @@ -486,7 +486,7 @@ class PdfGraphics { | ||
486 | } | 486 | } |
487 | 487 | ||
488 | assert(() { | 488 | assert(() { |
489 | - if (_page.pdfDocument.settings.verbose) { | 489 | + if (_page.settings.verbose) { |
490 | _buf.putString(' ' * math.max(0, _commentIndent - _buf.offset + o)); | 490 | _buf.putString(' ' * math.max(0, _commentIndent - _buf.offset + o)); |
491 | _buf.putComment( | 491 | _buf.putComment( |
492 | 'setFont(${font.ref()}, size: $size, charSpace: $charSpace, wordSpace: $wordSpace, scale: $scale, mode: ${mode.name}, rise: $rise)'); | 492 | 'setFont(${font.ref()}, size: $size, charSpace: $charSpace, wordSpace: $wordSpace, scale: $scale, mode: ${mode.name}, rise: $rise)'); |
@@ -509,7 +509,7 @@ class PdfGraphics { | @@ -509,7 +509,7 @@ class PdfGraphics { | ||
509 | double? rise, | 509 | double? rise, |
510 | }) { | 510 | }) { |
511 | assert(() { | 511 | assert(() { |
512 | - if (_page.pdfDocument.settings.verbose) { | 512 | + if (_page.settings.verbose) { |
513 | _buf.putString(' ' * (_indent)); | 513 | _buf.putString(' ' * (_indent)); |
514 | } | 514 | } |
515 | return true; | 515 | return true; |
@@ -518,7 +518,7 @@ class PdfGraphics { | @@ -518,7 +518,7 @@ class PdfGraphics { | ||
518 | _buf.putString('BT '); | 518 | _buf.putString('BT '); |
519 | 519 | ||
520 | assert(() { | 520 | assert(() { |
521 | - if (_page.pdfDocument.settings.verbose) { | 521 | + if (_page.settings.verbose) { |
522 | _buf.putString(' ' * (_commentIndent - 3 - _indent)); | 522 | _buf.putString(' ' * (_commentIndent - 3 - _indent)); |
523 | _buf.putComment('beginText()'); | 523 | _buf.putComment('beginText()'); |
524 | _indent += _indentAmount; | 524 | _indent += _indentAmount; |
@@ -535,7 +535,7 @@ class PdfGraphics { | @@ -535,7 +535,7 @@ class PdfGraphics { | ||
535 | 535 | ||
536 | var o = 0; | 536 | var o = 0; |
537 | assert(() { | 537 | assert(() { |
538 | - if (_page.pdfDocument.settings.verbose) { | 538 | + if (_page.settings.verbose) { |
539 | o = _buf.offset; | 539 | o = _buf.offset; |
540 | _buf.putString(' ' * (_indent)); | 540 | _buf.putString(' ' * (_indent)); |
541 | } | 541 | } |
@@ -546,7 +546,7 @@ class PdfGraphics { | @@ -546,7 +546,7 @@ class PdfGraphics { | ||
546 | _buf.putString(' Td '); | 546 | _buf.putString(' Td '); |
547 | 547 | ||
548 | assert(() { | 548 | assert(() { |
549 | - if (_page.pdfDocument.settings.verbose) { | 549 | + if (_page.settings.verbose) { |
550 | _buf.putString(' ' * math.max(0, _commentIndent - _buf.offset + o)); | 550 | _buf.putString(' ' * math.max(0, _commentIndent - _buf.offset + o)); |
551 | _buf.putComment('moveCursor($x, $y)'); | 551 | _buf.putComment('moveCursor($x, $y)'); |
552 | o = _buf.offset; | 552 | o = _buf.offset; |
@@ -560,7 +560,7 @@ class PdfGraphics { | @@ -560,7 +560,7 @@ class PdfGraphics { | ||
560 | _buf.putString(']TJ '); | 560 | _buf.putString(']TJ '); |
561 | 561 | ||
562 | assert(() { | 562 | assert(() { |
563 | - if (_page.pdfDocument.settings.verbose) { | 563 | + if (_page.settings.verbose) { |
564 | _buf.putString(' ' * math.max(0, _commentIndent - _buf.offset + o)); | 564 | _buf.putString(' ' * math.max(0, _commentIndent - _buf.offset + o)); |
565 | _buf.putComment('drawString("$s")'); | 565 | _buf.putComment('drawString("$s")'); |
566 | o = _buf.offset; | 566 | o = _buf.offset; |
@@ -573,7 +573,7 @@ class PdfGraphics { | @@ -573,7 +573,7 @@ class PdfGraphics { | ||
573 | _buf.putString('ET '); | 573 | _buf.putString('ET '); |
574 | 574 | ||
575 | assert(() { | 575 | assert(() { |
576 | - if (_page.pdfDocument.settings.verbose) { | 576 | + if (_page.settings.verbose) { |
577 | _buf.putString(' ' * (_commentIndent - 3 - _indent)); | 577 | _buf.putString(' ' * (_commentIndent - 3 - _indent)); |
578 | _buf.putComment('endText()'); | 578 | _buf.putComment('endText()'); |
579 | } | 579 | } |
@@ -585,7 +585,7 @@ class PdfGraphics { | @@ -585,7 +585,7 @@ class PdfGraphics { | ||
585 | 585 | ||
586 | void reset() { | 586 | void reset() { |
587 | assert(() { | 587 | assert(() { |
588 | - if (_page.pdfDocument.settings.verbose) { | 588 | + if (_page.settings.verbose) { |
589 | _buf.putString(' ' * (_indent)); | 589 | _buf.putString(' ' * (_indent)); |
590 | } | 590 | } |
591 | return true; | 591 | return true; |
@@ -594,7 +594,7 @@ class PdfGraphics { | @@ -594,7 +594,7 @@ class PdfGraphics { | ||
594 | _buf.putString('0 Tr '); | 594 | _buf.putString('0 Tr '); |
595 | 595 | ||
596 | assert(() { | 596 | assert(() { |
597 | - if (_page.pdfDocument.settings.verbose) { | 597 | + if (_page.settings.verbose) { |
598 | _buf.putString(' ' * (_commentIndent - 5 - _indent)); | 598 | _buf.putString(' ' * (_commentIndent - 5 - _indent)); |
599 | _buf.putComment('reset()'); | 599 | _buf.putComment('reset()'); |
600 | } | 600 | } |
@@ -612,7 +612,7 @@ class PdfGraphics { | @@ -612,7 +612,7 @@ class PdfGraphics { | ||
612 | void setFillColor(PdfColor? color) { | 612 | void setFillColor(PdfColor? color) { |
613 | var o = 0; | 613 | var o = 0; |
614 | assert(() { | 614 | assert(() { |
615 | - if (_page.pdfDocument.settings.verbose) { | 615 | + if (_page.settings.verbose) { |
616 | o = _buf.offset; | 616 | o = _buf.offset; |
617 | _buf.putString(' ' * (_indent)); | 617 | _buf.putString(' ' * (_indent)); |
618 | } | 618 | } |
@@ -630,7 +630,7 @@ class PdfGraphics { | @@ -630,7 +630,7 @@ class PdfGraphics { | ||
630 | } | 630 | } |
631 | 631 | ||
632 | assert(() { | 632 | assert(() { |
633 | - if (_page.pdfDocument.settings.verbose) { | 633 | + if (_page.settings.verbose) { |
634 | _buf.putString(' ' * math.max(0, _commentIndent - _buf.offset + o)); | 634 | _buf.putString(' ' * math.max(0, _commentIndent - _buf.offset + o)); |
635 | _buf.putComment('setFillColor(${color?.toHex()})'); | 635 | _buf.putComment('setFillColor(${color?.toHex()})'); |
636 | } | 636 | } |
@@ -642,7 +642,7 @@ class PdfGraphics { | @@ -642,7 +642,7 @@ class PdfGraphics { | ||
642 | void setStrokeColor(PdfColor? color) { | 642 | void setStrokeColor(PdfColor? color) { |
643 | var o = 0; | 643 | var o = 0; |
644 | assert(() { | 644 | assert(() { |
645 | - if (_page.pdfDocument.settings.verbose) { | 645 | + if (_page.settings.verbose) { |
646 | o = _buf.offset; | 646 | o = _buf.offset; |
647 | _buf.putString(' ' * (_indent)); | 647 | _buf.putString(' ' * (_indent)); |
648 | } | 648 | } |
@@ -660,7 +660,7 @@ class PdfGraphics { | @@ -660,7 +660,7 @@ class PdfGraphics { | ||
660 | } | 660 | } |
661 | 661 | ||
662 | assert(() { | 662 | assert(() { |
663 | - if (_page.pdfDocument.settings.verbose) { | 663 | + if (_page.settings.verbose) { |
664 | _buf.putString(' ' * math.max(0, _commentIndent - _buf.offset + o)); | 664 | _buf.putString(' ' * math.max(0, _commentIndent - _buf.offset + o)); |
665 | _buf.putComment('setStrokeColor(${color?.toHex()})'); | 665 | _buf.putComment('setStrokeColor(${color?.toHex()})'); |
666 | } | 666 | } |
@@ -672,7 +672,7 @@ class PdfGraphics { | @@ -672,7 +672,7 @@ class PdfGraphics { | ||
672 | void setFillPattern(PdfPattern pattern) { | 672 | void setFillPattern(PdfPattern pattern) { |
673 | var o = 0; | 673 | var o = 0; |
674 | assert(() { | 674 | assert(() { |
675 | - if (_page.pdfDocument.settings.verbose) { | 675 | + if (_page.settings.verbose) { |
676 | o = _buf.offset; | 676 | o = _buf.offset; |
677 | _buf.putString(' ' * (_indent)); | 677 | _buf.putString(' ' * (_indent)); |
678 | } | 678 | } |
@@ -684,7 +684,7 @@ class PdfGraphics { | @@ -684,7 +684,7 @@ class PdfGraphics { | ||
684 | _buf.putString('/Pattern cs${pattern.name} scn '); | 684 | _buf.putString('/Pattern cs${pattern.name} scn '); |
685 | 685 | ||
686 | assert(() { | 686 | assert(() { |
687 | - if (_page.pdfDocument.settings.verbose) { | 687 | + if (_page.settings.verbose) { |
688 | _buf.putString(' ' * math.max(0, _commentIndent - _buf.offset + o)); | 688 | _buf.putString(' ' * math.max(0, _commentIndent - _buf.offset + o)); |
689 | _buf.putComment('setFillPattern(${pattern.ref()})'); | 689 | _buf.putComment('setFillPattern(${pattern.ref()})'); |
690 | } | 690 | } |
@@ -696,7 +696,7 @@ class PdfGraphics { | @@ -696,7 +696,7 @@ class PdfGraphics { | ||
696 | void setStrokePattern(PdfPattern pattern) { | 696 | void setStrokePattern(PdfPattern pattern) { |
697 | var o = 0; | 697 | var o = 0; |
698 | assert(() { | 698 | assert(() { |
699 | - if (_page.pdfDocument.settings.verbose) { | 699 | + if (_page.settings.verbose) { |
700 | o = _buf.offset; | 700 | o = _buf.offset; |
701 | _buf.putString(' ' * (_indent)); | 701 | _buf.putString(' ' * (_indent)); |
702 | } | 702 | } |
@@ -708,7 +708,7 @@ class PdfGraphics { | @@ -708,7 +708,7 @@ class PdfGraphics { | ||
708 | _buf.putString('/Pattern CS${pattern.name} SCN '); | 708 | _buf.putString('/Pattern CS${pattern.name} SCN '); |
709 | 709 | ||
710 | assert(() { | 710 | assert(() { |
711 | - if (_page.pdfDocument.settings.verbose) { | 711 | + if (_page.settings.verbose) { |
712 | _buf.putString(' ' * math.max(0, _commentIndent - _buf.offset + o)); | 712 | _buf.putString(' ' * math.max(0, _commentIndent - _buf.offset + o)); |
713 | _buf.putComment('setStrokePattern(${pattern.ref()})'); | 713 | _buf.putComment('setStrokePattern(${pattern.ref()})'); |
714 | } | 714 | } |
@@ -720,7 +720,7 @@ class PdfGraphics { | @@ -720,7 +720,7 @@ class PdfGraphics { | ||
720 | void setGraphicState(PdfGraphicState state) { | 720 | void setGraphicState(PdfGraphicState state) { |
721 | var o = 0; | 721 | var o = 0; |
722 | assert(() { | 722 | assert(() { |
723 | - if (_page.pdfDocument.settings.verbose) { | 723 | + if (_page.settings.verbose) { |
724 | o = _buf.offset; | 724 | o = _buf.offset; |
725 | _buf.putString(' ' * (_indent)); | 725 | _buf.putString(' ' * (_indent)); |
726 | } | 726 | } |
@@ -731,7 +731,7 @@ class PdfGraphics { | @@ -731,7 +731,7 @@ class PdfGraphics { | ||
731 | _buf.putString('$name gs '); | 731 | _buf.putString('$name gs '); |
732 | 732 | ||
733 | assert(() { | 733 | assert(() { |
734 | - if (_page.pdfDocument.settings.verbose) { | 734 | + if (_page.settings.verbose) { |
735 | _buf.putString(' ' * math.max(0, _commentIndent - _buf.offset + o)); | 735 | _buf.putString(' ' * math.max(0, _commentIndent - _buf.offset + o)); |
736 | _buf.putComment('setGraphicState($state)'); | 736 | _buf.putComment('setGraphicState($state)'); |
737 | } | 737 | } |
@@ -743,7 +743,7 @@ class PdfGraphics { | @@ -743,7 +743,7 @@ class PdfGraphics { | ||
743 | void setTransform(Matrix4 t) { | 743 | void setTransform(Matrix4 t) { |
744 | var o = 0; | 744 | var o = 0; |
745 | assert(() { | 745 | assert(() { |
746 | - if (_page.pdfDocument.settings.verbose) { | 746 | + if (_page.settings.verbose) { |
747 | o = _buf.offset; | 747 | o = _buf.offset; |
748 | _buf.putString(' ' * (_indent)); | 748 | _buf.putString(' ' * (_indent)); |
749 | } | 749 | } |
@@ -757,7 +757,7 @@ class PdfGraphics { | @@ -757,7 +757,7 @@ class PdfGraphics { | ||
757 | _context.ctm.multiply(t); | 757 | _context.ctm.multiply(t); |
758 | 758 | ||
759 | assert(() { | 759 | assert(() { |
760 | - if (_page.pdfDocument.settings.verbose) { | 760 | + if (_page.settings.verbose) { |
761 | final n = math.max(0, _commentIndent - _buf.offset + o); | 761 | final n = math.max(0, _commentIndent - _buf.offset + o); |
762 | _buf.putString(' ' * n); | 762 | _buf.putString(' ' * n); |
763 | _buf.putComment('setTransform($s)'); | 763 | _buf.putComment('setTransform($s)'); |
@@ -775,7 +775,7 @@ class PdfGraphics { | @@ -775,7 +775,7 @@ class PdfGraphics { | ||
775 | void lineTo(double x, double y) { | 775 | void lineTo(double x, double y) { |
776 | var o = 0; | 776 | var o = 0; |
777 | assert(() { | 777 | assert(() { |
778 | - if (_page.pdfDocument.settings.verbose) { | 778 | + if (_page.settings.verbose) { |
779 | o = _buf.offset; | 779 | o = _buf.offset; |
780 | _buf.putString(' ' * (_indent)); | 780 | _buf.putString(' ' * (_indent)); |
781 | } | 781 | } |
@@ -786,7 +786,7 @@ class PdfGraphics { | @@ -786,7 +786,7 @@ class PdfGraphics { | ||
786 | _buf.putString(' l '); | 786 | _buf.putString(' l '); |
787 | 787 | ||
788 | assert(() { | 788 | assert(() { |
789 | - if (_page.pdfDocument.settings.verbose) { | 789 | + if (_page.settings.verbose) { |
790 | _buf.putString(' ' * math.max(0, _commentIndent - _buf.offset + o)); | 790 | _buf.putString(' ' * math.max(0, _commentIndent - _buf.offset + o)); |
791 | _buf.putComment('lineTo($x, $y)'); | 791 | _buf.putComment('lineTo($x, $y)'); |
792 | } | 792 | } |
@@ -798,7 +798,7 @@ class PdfGraphics { | @@ -798,7 +798,7 @@ class PdfGraphics { | ||
798 | void moveTo(double x, double y) { | 798 | void moveTo(double x, double y) { |
799 | var o = 0; | 799 | var o = 0; |
800 | assert(() { | 800 | assert(() { |
801 | - if (_page.pdfDocument.settings.verbose) { | 801 | + if (_page.settings.verbose) { |
802 | o = _buf.offset; | 802 | o = _buf.offset; |
803 | _buf.putString(' ' * (_indent)); | 803 | _buf.putString(' ' * (_indent)); |
804 | } | 804 | } |
@@ -809,7 +809,7 @@ class PdfGraphics { | @@ -809,7 +809,7 @@ class PdfGraphics { | ||
809 | _buf.putString(' m '); | 809 | _buf.putString(' m '); |
810 | 810 | ||
811 | assert(() { | 811 | assert(() { |
812 | - if (_page.pdfDocument.settings.verbose) { | 812 | + if (_page.settings.verbose) { |
813 | _buf.putString(' ' * math.max(0, _commentIndent - _buf.offset + o)); | 813 | _buf.putString(' ' * math.max(0, _commentIndent - _buf.offset + o)); |
814 | _buf.putComment('moveTo($x, $y)'); | 814 | _buf.putComment('moveTo($x, $y)'); |
815 | } | 815 | } |
@@ -824,7 +824,7 @@ class PdfGraphics { | @@ -824,7 +824,7 @@ class PdfGraphics { | ||
824 | double x1, double y1, double x2, double y2, double x3, double y3) { | 824 | double x1, double y1, double x2, double y2, double x3, double y3) { |
825 | var o = 0; | 825 | var o = 0; |
826 | assert(() { | 826 | assert(() { |
827 | - if (_page.pdfDocument.settings.verbose) { | 827 | + if (_page.settings.verbose) { |
828 | o = _buf.offset; | 828 | o = _buf.offset; |
829 | _buf.putString(' ' * (_indent)); | 829 | _buf.putString(' ' * (_indent)); |
830 | } | 830 | } |
@@ -835,7 +835,7 @@ class PdfGraphics { | @@ -835,7 +835,7 @@ class PdfGraphics { | ||
835 | _buf.putString(' c '); | 835 | _buf.putString(' c '); |
836 | 836 | ||
837 | assert(() { | 837 | assert(() { |
838 | - if (_page.pdfDocument.settings.verbose) { | 838 | + if (_page.settings.verbose) { |
839 | _buf.putString(' ' * math.max(0, _commentIndent - _buf.offset + o)); | 839 | _buf.putString(' ' * math.max(0, _commentIndent - _buf.offset + o)); |
840 | _buf.putComment('curveTo($x1, $y1, $x2, $y2, $x3, $y3)'); | 840 | _buf.putComment('curveTo($x1, $y1, $x2, $y2, $x3, $y3)'); |
841 | } | 841 | } |
@@ -1001,7 +1001,7 @@ class PdfGraphics { | @@ -1001,7 +1001,7 @@ class PdfGraphics { | ||
1001 | /// Set line starting and ending cap type | 1001 | /// Set line starting and ending cap type |
1002 | void setLineCap(PdfLineCap cap) { | 1002 | void setLineCap(PdfLineCap cap) { |
1003 | assert(() { | 1003 | assert(() { |
1004 | - if (_page.pdfDocument.settings.verbose) { | 1004 | + if (_page.settings.verbose) { |
1005 | _buf.putString(' ' * (_indent)); | 1005 | _buf.putString(' ' * (_indent)); |
1006 | } | 1006 | } |
1007 | return true; | 1007 | return true; |
@@ -1010,7 +1010,7 @@ class PdfGraphics { | @@ -1010,7 +1010,7 @@ class PdfGraphics { | ||
1010 | _buf.putString('${cap.index} J '); | 1010 | _buf.putString('${cap.index} J '); |
1011 | 1011 | ||
1012 | assert(() { | 1012 | assert(() { |
1013 | - if (_page.pdfDocument.settings.verbose) { | 1013 | + if (_page.settings.verbose) { |
1014 | _buf.putString(' ' * (_commentIndent - 4 - _indent)); | 1014 | _buf.putString(' ' * (_commentIndent - 4 - _indent)); |
1015 | _buf.putComment('setLineCap(${cap.name})'); | 1015 | _buf.putComment('setLineCap(${cap.name})'); |
1016 | } | 1016 | } |
@@ -1021,7 +1021,7 @@ class PdfGraphics { | @@ -1021,7 +1021,7 @@ class PdfGraphics { | ||
1021 | /// Set line join type | 1021 | /// Set line join type |
1022 | void setLineJoin(PdfLineJoin join) { | 1022 | void setLineJoin(PdfLineJoin join) { |
1023 | assert(() { | 1023 | assert(() { |
1024 | - if (_page.pdfDocument.settings.verbose) { | 1024 | + if (_page.settings.verbose) { |
1025 | _buf.putString(' ' * (_indent)); | 1025 | _buf.putString(' ' * (_indent)); |
1026 | } | 1026 | } |
1027 | return true; | 1027 | return true; |
@@ -1030,7 +1030,7 @@ class PdfGraphics { | @@ -1030,7 +1030,7 @@ class PdfGraphics { | ||
1030 | _buf.putString('${join.index} j '); | 1030 | _buf.putString('${join.index} j '); |
1031 | 1031 | ||
1032 | assert(() { | 1032 | assert(() { |
1033 | - if (_page.pdfDocument.settings.verbose) { | 1033 | + if (_page.settings.verbose) { |
1034 | _buf.putString(' ' * (_commentIndent - 4 - _indent)); | 1034 | _buf.putString(' ' * (_commentIndent - 4 - _indent)); |
1035 | _buf.putComment('setLineJoin(${join.name})'); | 1035 | _buf.putComment('setLineJoin(${join.name})'); |
1036 | } | 1036 | } |
@@ -1042,7 +1042,7 @@ class PdfGraphics { | @@ -1042,7 +1042,7 @@ class PdfGraphics { | ||
1042 | void setLineWidth(double width) { | 1042 | void setLineWidth(double width) { |
1043 | var o = 0; | 1043 | var o = 0; |
1044 | assert(() { | 1044 | assert(() { |
1045 | - if (_page.pdfDocument.settings.verbose) { | 1045 | + if (_page.settings.verbose) { |
1046 | o = _buf.offset; | 1046 | o = _buf.offset; |
1047 | _buf.putString(' ' * (_indent)); | 1047 | _buf.putString(' ' * (_indent)); |
1048 | } | 1048 | } |
@@ -1053,7 +1053,7 @@ class PdfGraphics { | @@ -1053,7 +1053,7 @@ class PdfGraphics { | ||
1053 | _buf.putString(' w '); | 1053 | _buf.putString(' w '); |
1054 | 1054 | ||
1055 | assert(() { | 1055 | assert(() { |
1056 | - if (_page.pdfDocument.settings.verbose) { | 1056 | + if (_page.settings.verbose) { |
1057 | _buf.putString(' ' * math.max(0, _commentIndent - _buf.offset + o)); | 1057 | _buf.putString(' ' * math.max(0, _commentIndent - _buf.offset + o)); |
1058 | _buf.putComment('setLineWidth($width)'); | 1058 | _buf.putComment('setLineWidth($width)'); |
1059 | } | 1059 | } |
@@ -1065,7 +1065,7 @@ class PdfGraphics { | @@ -1065,7 +1065,7 @@ class PdfGraphics { | ||
1065 | void setMiterLimit(double limit) { | 1065 | void setMiterLimit(double limit) { |
1066 | var o = 0; | 1066 | var o = 0; |
1067 | assert(() { | 1067 | assert(() { |
1068 | - if (_page.pdfDocument.settings.verbose) { | 1068 | + if (_page.settings.verbose) { |
1069 | o = _buf.offset; | 1069 | o = _buf.offset; |
1070 | _buf.putString(' ' * (_indent)); | 1070 | _buf.putString(' ' * (_indent)); |
1071 | } | 1071 | } |
@@ -1077,7 +1077,7 @@ class PdfGraphics { | @@ -1077,7 +1077,7 @@ class PdfGraphics { | ||
1077 | _buf.putString(' M '); | 1077 | _buf.putString(' M '); |
1078 | 1078 | ||
1079 | assert(() { | 1079 | assert(() { |
1080 | - if (_page.pdfDocument.settings.verbose) { | 1080 | + if (_page.settings.verbose) { |
1081 | _buf.putString(' ' * math.max(0, _commentIndent - _buf.offset + o)); | 1081 | _buf.putString(' ' * math.max(0, _commentIndent - _buf.offset + o)); |
1082 | _buf.putComment('setMiterLimit($limit)'); | 1082 | _buf.putComment('setMiterLimit($limit)'); |
1083 | } | 1083 | } |
@@ -1092,7 +1092,7 @@ class PdfGraphics { | @@ -1092,7 +1092,7 @@ class PdfGraphics { | ||
1092 | void setLineDashPattern([List<num> array = const <num>[], int phase = 0]) { | 1092 | void setLineDashPattern([List<num> array = const <num>[], int phase = 0]) { |
1093 | var o = 0; | 1093 | var o = 0; |
1094 | assert(() { | 1094 | assert(() { |
1095 | - if (_page.pdfDocument.settings.verbose) { | 1095 | + if (_page.settings.verbose) { |
1096 | o = _buf.offset; | 1096 | o = _buf.offset; |
1097 | _buf.putString(' ' * (_indent)); | 1097 | _buf.putString(' ' * (_indent)); |
1098 | } | 1098 | } |
@@ -1103,7 +1103,7 @@ class PdfGraphics { | @@ -1103,7 +1103,7 @@ class PdfGraphics { | ||
1103 | _buf.putString(' $phase d '); | 1103 | _buf.putString(' $phase d '); |
1104 | 1104 | ||
1105 | assert(() { | 1105 | assert(() { |
1106 | - if (_page.pdfDocument.settings.verbose) { | 1106 | + if (_page.settings.verbose) { |
1107 | _buf.putString(' ' * math.max(0, _commentIndent - _buf.offset + o)); | 1107 | _buf.putString(' ' * math.max(0, _commentIndent - _buf.offset + o)); |
1108 | _buf.putComment('setLineDashPattern($array, $phase)'); | 1108 | _buf.putComment('setLineDashPattern($array, $phase)'); |
1109 | } | 1109 | } |
@@ -1114,7 +1114,7 @@ class PdfGraphics { | @@ -1114,7 +1114,7 @@ class PdfGraphics { | ||
1114 | void markContentBegin(PdfName tag) { | 1114 | void markContentBegin(PdfName tag) { |
1115 | var o = 0; | 1115 | var o = 0; |
1116 | assert(() { | 1116 | assert(() { |
1117 | - if (_page.pdfDocument.settings.verbose) { | 1117 | + if (_page.settings.verbose) { |
1118 | o = _buf.offset; | 1118 | o = _buf.offset; |
1119 | _buf.putString(' ' * (_indent)); | 1119 | _buf.putString(' ' * (_indent)); |
1120 | } | 1120 | } |
@@ -1125,7 +1125,7 @@ class PdfGraphics { | @@ -1125,7 +1125,7 @@ class PdfGraphics { | ||
1125 | _buf.putString(' BMC '); | 1125 | _buf.putString(' BMC '); |
1126 | 1126 | ||
1127 | assert(() { | 1127 | assert(() { |
1128 | - if (_page.pdfDocument.settings.verbose) { | 1128 | + if (_page.settings.verbose) { |
1129 | _buf.putString(' ' * math.max(0, _commentIndent - _buf.offset + o)); | 1129 | _buf.putString(' ' * math.max(0, _commentIndent - _buf.offset + o)); |
1130 | _buf.putComment('markContentBegin($tag)'); | 1130 | _buf.putComment('markContentBegin($tag)'); |
1131 | } | 1131 | } |
@@ -1135,7 +1135,7 @@ class PdfGraphics { | @@ -1135,7 +1135,7 @@ class PdfGraphics { | ||
1135 | 1135 | ||
1136 | void markContentEnd() { | 1136 | void markContentEnd() { |
1137 | assert(() { | 1137 | assert(() { |
1138 | - if (_page.pdfDocument.settings.verbose) { | 1138 | + if (_page.settings.verbose) { |
1139 | _buf.putString(' ' * (_indent)); | 1139 | _buf.putString(' ' * (_indent)); |
1140 | } | 1140 | } |
1141 | return true; | 1141 | return true; |
@@ -1144,7 +1144,7 @@ class PdfGraphics { | @@ -1144,7 +1144,7 @@ class PdfGraphics { | ||
1144 | _buf.putString('EMC '); | 1144 | _buf.putString('EMC '); |
1145 | 1145 | ||
1146 | assert(() { | 1146 | assert(() { |
1147 | - if (_page.pdfDocument.settings.verbose) { | 1147 | + if (_page.settings.verbose) { |
1148 | _buf.putString(' ' * (_commentIndent - 4 - _indent)); | 1148 | _buf.putString(' ' * (_commentIndent - 4 - _indent)); |
1149 | _buf.putComment('markContentEnd()'); | 1149 | _buf.putComment('markContentEnd()'); |
1150 | } | 1150 | } |
@@ -39,7 +39,7 @@ class PdfObjectDict extends PdfObject<PdfDict> { | @@ -39,7 +39,7 @@ class PdfObjectDict extends PdfObject<PdfDict> { | ||
39 | @override | 39 | @override |
40 | void writeContent(PdfStream s) { | 40 | void writeContent(PdfStream s) { |
41 | if (params.isNotEmpty) { | 41 | if (params.isNotEmpty) { |
42 | - params.output(this, s, pdfDocument.settings.verbose ? 0 : null); | 42 | + params.output(this, s, settings.verbose ? 0 : null); |
43 | s.putByte(0x0a); | 43 | s.putByte(0x0a); |
44 | } | 44 | } |
45 | } | 45 | } |
@@ -47,7 +47,7 @@ class PdfObjectStream extends PdfObject<PdfDict> { | @@ -47,7 +47,7 @@ class PdfObjectStream extends PdfObject<PdfDict> { | ||
47 | isBinary: isBinary, | 47 | isBinary: isBinary, |
48 | values: params.values, | 48 | values: params.values, |
49 | data: buf.output(), | 49 | data: buf.output(), |
50 | - ).output(this, s, pdfDocument.settings.verbose ? 0 : null); | 50 | + ).output(this, s, settings.verbose ? 0 : null); |
51 | s.putByte(0x0a); | 51 | s.putByte(0x0a); |
52 | } | 52 | } |
53 | } | 53 | } |
-
Please register or login to post a comment