br_danfe 1.2.2 → 1.2.3

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 (138) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile.lock +19 -16
  3. data/README.md +10 -4
  4. data/br_danfe.gemspec +3 -3
  5. data/lib/br_danfe/version.rb +1 -1
  6. data/spec/fixtures/cce/lib/barcode#render.pdf +14 -14
  7. data/spec/fixtures/cce/lib/correction#render.pdf +0 -0
  8. data/spec/fixtures/cce/lib/document#box.pdf +14 -14
  9. data/spec/fixtures/cce/lib/document#box.with.block.pdf +0 -0
  10. data/spec/fixtures/cce/lib/document#text.align.pdf +0 -0
  11. data/spec/fixtures/cce/lib/document#text.pad.pdf +0 -0
  12. data/spec/fixtures/cce/lib/document#text.simple.pdf +0 -0
  13. data/spec/fixtures/cce/lib/document#text.size.pdf +0 -0
  14. data/spec/fixtures/cce/lib/document#text.style.pdf +0 -0
  15. data/spec/fixtures/cce/lib/footer#render.pdf +0 -0
  16. data/spec/fixtures/cce/lib/header#render.pdf +0 -0
  17. data/spec/fixtures/cce/lib/nfe_key#render.pdf +0 -0
  18. data/spec/fixtures/cce/lib/protocol#render.pdf +0 -0
  19. data/spec/fixtures/cce/v1.00/cce.fixture.pdf +265 -149
  20. data/spec/fixtures/mdfe/lib/fisco_control#barcode.pdf +0 -0
  21. data/spec/fixtures/mdfe/lib/fisco_control#without-barcode.pdf +0 -0
  22. data/spec/fixtures/mdfe/lib/header#render-qr-code.pdf +0 -0
  23. data/spec/fixtures/mdfe/lib/header#render-with_logo.pdf +0 -0
  24. data/spec/fixtures/mdfe/lib/header#render-without-qr-code.pdf +0 -0
  25. data/spec/fixtures/mdfe/lib/header#render-without_logo.pdf +0 -0
  26. data/spec/fixtures/mdfe/lib/mdfe-with-multiple-pages.pdf +344 -176
  27. data/spec/fixtures/mdfe/lib/mdfe.fixture.pdf +336 -168
  28. data/spec/fixtures/mdfe/lib/notes#render-big-aditional-information.pdf +219 -151
  29. data/spec/fixtures/nfce/lib/document#render.pdf +20 -20
  30. data/spec/fixtures/nfce/lib/footer#render-with_additional_information.pdf +0 -0
  31. data/spec/fixtures/nfce/lib/footer#render.pdf +0 -0
  32. data/spec/fixtures/nfce/lib/header#render-homologation.pdf +0 -0
  33. data/spec/fixtures/nfce/lib/header#render-long_name_with_logo.pdf +0 -0
  34. data/spec/fixtures/nfce/lib/header#render-long_name_without_logo.pdf +0 -0
  35. data/spec/fixtures/nfce/lib/header#render-short_name_with_logo.pdf +0 -0
  36. data/spec/fixtures/nfce/lib/header#render-short_name_without_logo.pdf +0 -0
  37. data/spec/fixtures/nfce/lib/key#render.pdf +0 -0
  38. data/spec/fixtures/nfce/lib/nfce_identification#render.pdf +0 -0
  39. data/spec/fixtures/nfce/lib/product_list#render-with_many_products.pdf +0 -0
  40. data/spec/fixtures/nfce/lib/product_list#render-with_many_products_and_long_names.pdf +0 -0
  41. data/spec/fixtures/nfce/lib/product_list#render-with_single_product.pdf +0 -0
  42. data/spec/fixtures/nfce/lib/product_list#render-with_single_product_and_long_name.pdf +0 -0
  43. data/spec/fixtures/nfce/lib/recipient#render-company.pdf +0 -0
  44. data/spec/fixtures/nfce/lib/recipient#render-consumer_without_document.pdf +0 -0
  45. data/spec/fixtures/nfce/lib/recipient#render-foreign.pdf +0 -0
  46. data/spec/fixtures/nfce/lib/recipient#render-individual.pdf +0 -0
  47. data/spec/fixtures/nfce/lib/recipient#render-unidentified_consumer.pdf +0 -0
  48. data/spec/fixtures/nfce/lib/total_list#does_not_render-payment_methods.pdf +0 -0
  49. data/spec/fixtures/nfce/lib/total_list#render-grouped_payment_methods.pdf +0 -0
  50. data/spec/fixtures/nfce/lib/total_list#render-totals.pdf +0 -0
  51. data/spec/fixtures/nfce/lib/total_list#render-without_payment.pdf +0 -0
  52. data/spec/fixtures/nfce/lib/total_list#render.pdf +0 -0
  53. data/spec/fixtures/nfce/v4.00/multiples_xmls_on_the_same_pdf.pdf +336 -205
  54. data/spec/fixtures/nfce/v4.00/nfce-unauthorized-hom.fixture.pdf +0 -0
  55. data/spec/fixtures/nfce/v4.00/nfce-unauthorized-prod.fixture.pdf +0 -0
  56. data/spec/fixtures/nfce/v4.00/rendered_nfce.fixture.pdf +0 -0
  57. data/spec/fixtures/nfce/v4.00/saved_nfce.fixture.pdf +0 -0
  58. data/spec/fixtures/nfe/lib/dest#render-v2.00.pdf +0 -0
  59. data/spec/fixtures/nfe/lib/dest#render-v3.10.pdf +0 -0
  60. data/spec/fixtures/nfe/lib/dest#render-v4.00.pdf +0 -0
  61. data/spec/fixtures/nfe/lib/dest#render-with-address-bigger.pdf +0 -0
  62. data/spec/fixtures/nfe/lib/dest#render-with_cnpj.pdf +0 -0
  63. data/spec/fixtures/nfe/lib/dest#render-with_cpf.pdf +0 -0
  64. data/spec/fixtures/nfe/lib/dest#render-with_ie.pdf +0 -0
  65. data/spec/fixtures/nfe/lib/dest#render-without-address-complement.pdf +0 -0
  66. data/spec/fixtures/nfe/lib/det_body#render-csosn.pdf +144 -82
  67. data/spec/fixtures/nfe/lib/det_body#render-cst.pdf +129 -81
  68. data/spec/fixtures/nfe/lib/det_body#render-fci.pdf +124 -85
  69. data/spec/fixtures/nfe/lib/det_body#render-icms_st.pdf +133 -89
  70. data/spec/fixtures/nfe/lib/det_body#render-quantity_with_custom_precision.pdf +122 -84
  71. data/spec/fixtures/nfe/lib/det_body#render-three_pages.pdf +140 -85
  72. data/spec/fixtures/nfe/lib/det_body#render-two_pages.pdf +140 -85
  73. data/spec/fixtures/nfe/lib/det_body#render-unit_price_with_custom_precision.pdf +122 -84
  74. data/spec/fixtures/nfe/lib/det_body#render-with_entrega.pdf +118 -64
  75. data/spec/fixtures/nfe/lib/det_body#render-with_infadprod.pdf +131 -76
  76. data/spec/fixtures/nfe/lib/det_body#render-with_issqn.pdf +140 -85
  77. data/spec/fixtures/nfe/lib/det_body#render-without_issqn.pdf +140 -85
  78. data/spec/fixtures/nfe/lib/document#lcnpj-blank.pdf +0 -0
  79. data/spec/fixtures/nfe/lib/document#lcnpj-invalid.pdf +0 -0
  80. data/spec/fixtures/nfe/lib/document#lcnpj-valid.pdf +0 -0
  81. data/spec/fixtures/nfe/lib/document#lie-blank-uf-invalid.pdf +0 -0
  82. data/spec/fixtures/nfe/lib/document#lie-blank.pdf +0 -0
  83. data/spec/fixtures/nfe/lib/document#lie-invalid.pdf +0 -0
  84. data/spec/fixtures/nfe/lib/document#lie-valid.pdf +0 -0
  85. data/spec/fixtures/nfe/lib/dup#render-with_entrega.pdf +0 -0
  86. data/spec/fixtures/nfe/lib/dup#render.pdf +0 -0
  87. data/spec/fixtures/nfe/lib/emit_header#render-nfe_key.pdf +283 -151
  88. data/spec/fixtures/nfe/lib/emit_header#render-second_page.pdf +283 -151
  89. data/spec/fixtures/nfe/lib/emit_header#render-with_logo.pdf +283 -151
  90. data/spec/fixtures/nfe/lib/emit_header#render-without_logo.pdf +264 -132
  91. data/spec/fixtures/nfe/lib/entrega#render-v2.00.pdf +0 -0
  92. data/spec/fixtures/nfe/lib/entrega#render-with-address-bigger.pdf +0 -0
  93. data/spec/fixtures/nfe/lib/entrega#render-with_cpf.pdf +0 -0
  94. data/spec/fixtures/nfe/lib/icmstot#render-with_entrega.pdf +0 -0
  95. data/spec/fixtures/nfe/lib/icmstot#render.pdf +0 -0
  96. data/spec/fixtures/nfe/lib/infadic#render-all_the_informations.pdf +0 -0
  97. data/spec/fixtures/nfe/lib/infadic#render-difal.pdf +0 -0
  98. data/spec/fixtures/nfe/lib/infadic#render-extra_volume.pdf +0 -0
  99. data/spec/fixtures/nfe/lib/infadic#render-with_complementary_information.pdf +0 -0
  100. data/spec/fixtures/nfe/lib/infadic#render-with_dup_additional_information.pdf +0 -0
  101. data/spec/fixtures/nfe/lib/infadic#render-with_fisco_additional_information.pdf +0 -0
  102. data/spec/fixtures/nfe/lib/infadic#render-with_street_data.pdf +0 -0
  103. data/spec/fixtures/nfe/lib/infadic#render-without_dup_additional_information.pdf +0 -0
  104. data/spec/fixtures/nfe/lib/infadic#render.pdf +0 -0
  105. data/spec/fixtures/nfe/lib/infadic_vol#render-extra_volume.pdf +0 -0
  106. data/spec/fixtures/nfe/lib/issqn#render-with_entrega.pdf +0 -0
  107. data/spec/fixtures/nfe/lib/issqn#render-with_issqn.pdf +0 -0
  108. data/spec/fixtures/nfe/lib/issqn#render-with_one_issqn_value.pdf +0 -0
  109. data/spec/fixtures/nfe/lib/issqn#render-without_issqn.pdf +14 -14
  110. data/spec/fixtures/nfe/lib/ticket#render.pdf +0 -0
  111. data/spec/fixtures/nfe/lib/ticket#render_with_dEmit.pdf +0 -0
  112. data/spec/fixtures/nfe/lib/ticket#render_with_dhEmit.pdf +0 -0
  113. data/spec/fixtures/nfe/lib/transp#render-modfrete_0.pdf +0 -0
  114. data/spec/fixtures/nfe/lib/transp#render-modfrete_1.pdf +0 -0
  115. data/spec/fixtures/nfe/lib/transp#render-modfrete_2.pdf +0 -0
  116. data/spec/fixtures/nfe/lib/transp#render-modfrete_3.pdf +0 -0
  117. data/spec/fixtures/nfe/lib/transp#render-modfrete_4.pdf +0 -0
  118. data/spec/fixtures/nfe/lib/transp#render-modfrete_9.pdf +0 -0
  119. data/spec/fixtures/nfe/lib/transp#render-with_entrega.pdf +0 -0
  120. data/spec/fixtures/nfe/lib/transp#render.pdf +0 -0
  121. data/spec/fixtures/nfe/lib/vol#render-blank-boxes.pdf +0 -0
  122. data/spec/fixtures/nfe/lib/vol#render-with_entrega.pdf +0 -0
  123. data/spec/fixtures/nfe/lib/vol#render.pdf +0 -0
  124. data/spec/fixtures/nfe/v2.00/custom_options.fixture.pdf +312 -185
  125. data/spec/fixtures/nfe/v2.00/nfe_simples_nacional.xml.fixture.pdf +293 -166
  126. data/spec/fixtures/nfe/v2.00/nfe_with_entrega.xml.fixture.pdf +296 -166
  127. data/spec/fixtures/nfe/v2.00/nfe_with_extra_volumes.xml.fixture.pdf +419 -221
  128. data/spec/fixtures/nfe/v2.00/nfe_with_fci.xml.fixture.pdf +311 -163
  129. data/spec/fixtures/nfe/v2.00/nfe_with_ns.xml.fixture.pdf +309 -171
  130. data/spec/fixtures/nfe/v2.00/nfe_without_ns.xml.fixture.pdf +303 -152
  131. data/spec/fixtures/nfe/v3.10/multiples.xmls.on.the.same.pdf.pdf +320 -152
  132. data/spec/fixtures/nfe/v3.10/nfe_simples_nacional.xml.fixture.pdf +312 -144
  133. data/spec/fixtures/nfe/v3.10/with_footer.fixture.pdf +323 -169
  134. data/spec/fixtures/nfe/v3.10/with_issqn.fixture.pdf +314 -138
  135. data/spec/fixtures/nfe/v3.10/with_three_pages.fixture.pdf +330 -159
  136. data/spec/fixtures/nfe/v3.10/without_issqn.fixture.pdf +319 -148
  137. data/spec/fixtures/qr_code/qr_code#render.pdf +0 -0
  138. metadata +9 -9
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 28c418d7f4785e8fcc28658e76cb02822bfecb86f958a8d1bc167af5852000e1
4
- data.tar.gz: 1e936227f6c1b3393b4e1bfafbda8577c23ab9aabde593694648bf965ea6b609
3
+ metadata.gz: 77b80a670ecd1d7c56bd346ad493a91e28d9b9f58aeff96e2feff598c56ac06d
4
+ data.tar.gz: a7fc99c996a113d9a0cade611c1f965ec0854313294004a026b772483b2cc765
5
5
  SHA512:
6
- metadata.gz: 6c4a931f688d5e4d65c3491d4ee35cb815589a1f1e9f4a01d946122b3cdfa54dcc8468885e8d70eb23797f7950e0cdce6adff668909252d257847f5b024e507e
7
- data.tar.gz: 56aa6e7aab5fe64836d309ceb6d8748997dbd48cd4e4b3c38197c6da16f446f554c8c4ecb5766c4c4291460d3a24640def739c522ca502a43d9afc3861796741
6
+ metadata.gz: 2d07ec3c1a879cf644791ed3eda0212e9e50dc25259deb5d52172f71f19f48a69955588034d4f36ca165e3ccbf58202e530a4fb8d311494c62907dc2c28e5211
7
+ data.tar.gz: 1333a3e830b1d8f3cd53d21dc7d9612153182fb381930a9bd9a773ea1e27c47a25e2d1da07a1da3dc3808ad74960a39436cdc16e32d27fd9e1d24561263bf4b0
data/Gemfile.lock CHANGED
@@ -1,12 +1,12 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- br_danfe (1.2.2)
4
+ br_danfe (1.2.3)
5
5
  barby (= 0.6.9)
6
6
  br_documents (>= 0.1.3)
7
7
  i18n (>= 0.8.6)
8
8
  nokogiri (>= 1.8)
9
- prawn (~> 2.4.0)
9
+ prawn (~> 2.5.0)
10
10
  prawn-table (= 0.2.2)
11
11
  rqrcode (>= 2.1, < 2.3)
12
12
 
@@ -43,9 +43,9 @@ GEM
43
43
  docile (1.4.1)
44
44
  drb (2.2.0)
45
45
  ruby2_keywords
46
- ffi (1.16.3)
46
+ ffi (1.17.0)
47
47
  formatador (1.1.0)
48
- guard (2.18.1)
48
+ guard (2.19.0)
49
49
  formatador (>= 0.2.4)
50
50
  listen (>= 2.7, < 4.0)
51
51
  lumberjack (>= 1.0.12, < 2.0)
@@ -62,11 +62,12 @@ GEM
62
62
  hashery (2.1.2)
63
63
  i18n (1.14.5)
64
64
  concurrent-ruby (~> 1.0)
65
- listen (3.8.0)
65
+ listen (3.9.0)
66
66
  rb-fsevent (~> 0.10, >= 0.10.3)
67
67
  rb-inotify (~> 0.9, >= 0.9.10)
68
68
  lumberjack (1.2.10)
69
- method_source (1.0.0)
69
+ matrix (0.4.2)
70
+ method_source (1.1.0)
70
71
  mini_portile2 (2.8.7)
71
72
  minitest (5.21.2)
72
73
  mutex_m (0.2.0)
@@ -80,7 +81,7 @@ GEM
80
81
  parallel (1.21.0)
81
82
  parser (3.0.2.0)
82
83
  ast (~> 2.4.1)
83
- pdf-core (0.9.0)
84
+ pdf-core (0.10.0)
84
85
  pdf-inspector (1.3.0)
85
86
  pdf-reader (>= 1.0, < 3.0.a)
86
87
  pdf-reader (2.5.0)
@@ -89,9 +90,10 @@ GEM
89
90
  hashery (~> 2.0)
90
91
  ruby-rc4
91
92
  ttfunk
92
- prawn (2.4.0)
93
- pdf-core (~> 0.9.0)
94
- ttfunk (~> 1.7)
93
+ prawn (2.5.0)
94
+ matrix (~> 0.4)
95
+ pdf-core (~> 0.10.0)
96
+ ttfunk (~> 1.8)
95
97
  prawn-table (0.2.2)
96
98
  prawn (>= 1.3.0, < 3.0.0)
97
99
  pry (0.14.2)
@@ -101,7 +103,7 @@ GEM
101
103
  rainbow (3.0.0)
102
104
  rake (13.2.1)
103
105
  rb-fsevent (0.11.2)
104
- rb-inotify (0.10.1)
106
+ rb-inotify (0.11.1)
105
107
  ffi (~> 1.0)
106
108
  regexp_parser (2.1.1)
107
109
  rexml (3.3.3)
@@ -148,11 +150,12 @@ GEM
148
150
  docile (~> 1.1)
149
151
  simplecov-html (~> 0.11)
150
152
  simplecov_json_formatter (~> 0.1)
151
- simplecov-html (0.12.3)
153
+ simplecov-html (0.13.1)
152
154
  simplecov_json_formatter (0.1.4)
153
155
  strscan (3.1.0)
154
- thor (1.3.0)
155
- ttfunk (1.7.0)
156
+ thor (1.3.2)
157
+ ttfunk (1.8.0)
158
+ bigdecimal (~> 3.1)
156
159
  tzinfo (2.0.6)
157
160
  concurrent-ruby (~> 1.0)
158
161
  unicode-display_width (1.8.0)
@@ -163,7 +166,7 @@ PLATFORMS
163
166
  DEPENDENCIES
164
167
  br_danfe!
165
168
  byebug (= 11.1.3)
166
- guard (~> 2.18.1)
169
+ guard (~> 2.19.0)
167
170
  guard-rspec (~> 4.7.3)
168
171
  pdf-inspector (~> 1.3.0)
169
172
  rake (= 13.2.1)
@@ -172,7 +175,7 @@ DEPENDENCIES
172
175
  rubocop-performance (~> 1.10.2)
173
176
  rubocop-rspec (~> 1.44.1)
174
177
  simplecov (= 0.22.0)
175
- simplecov-html (= 0.12.3)
178
+ simplecov-html (= 0.13.1)
176
179
 
177
180
  BUNDLED WITH
178
181
  2.5.5
data/README.md CHANGED
@@ -229,18 +229,24 @@ You can generate new data using [4devs generators](http://www.4devs.com.br).
229
229
 
230
230
  ## Deploy to Rubygems
231
231
 
232
- 1. Create and send the new version to Rubygems
232
+ 1. To deploy a new version:
233
233
 
234
- $ bundle exec rake release
234
+ * Define the new version at `lib/br_danfe/version.rb`;
235
+ * Execute `$ bundle`;
236
+ * Commit all and push to Github;
235
237
 
236
- 2. Create a [new release on Github](https://github.com/asseinfo/br_danfe/releases/new)
238
+ 2. Send the new version to Rubygems
239
+
240
+ * $ bundle exec rake release
241
+
242
+ 3. Create a [new release on Github](https://github.com/asseinfo/br_danfe/releases/new)
237
243
 
238
244
  * Choose **the new tag** (Ex.: v0.10.1)
239
245
  * Fill the **Release title** (Ex.: 0.10.1)
240
246
  * Click at **Generate release notes**
241
247
  * Click at **Publish release**
242
248
 
243
- 3. Done!
249
+ 4. Done!
244
250
 
245
251
  You can build or install the gem using one of the above tasks
246
252
 
data/br_danfe.gemspec CHANGED
@@ -20,12 +20,12 @@ Gem::Specification.new do |spec|
20
20
  spec.add_dependency 'br_documents', '>= 0.1.3'
21
21
  spec.add_dependency 'i18n', '>= 0.8.6'
22
22
  spec.add_dependency 'nokogiri', '>= 1.8'
23
- spec.add_dependency 'prawn', '~> 2.4.0'
23
+ spec.add_dependency 'prawn', '~> 2.5.0'
24
24
  spec.add_dependency 'prawn-table', '0.2.2'
25
25
  spec.add_dependency 'rqrcode', '>= 2.1', '< 2.3'
26
26
 
27
27
  spec.add_development_dependency 'byebug', '11.1.3'
28
- spec.add_development_dependency 'guard', '~> 2.18.1'
28
+ spec.add_development_dependency 'guard', '~> 2.19.0'
29
29
  spec.add_development_dependency 'guard-rspec', '~> 4.7.3'
30
30
  spec.add_development_dependency 'pdf-inspector', '~> 1.3.0'
31
31
  spec.add_development_dependency 'rake', '13.2.1'
@@ -34,5 +34,5 @@ Gem::Specification.new do |spec|
34
34
  spec.add_development_dependency 'rubocop-performance', '~> 1.10.2'
35
35
  spec.add_development_dependency 'rubocop-rspec', '~> 1.44.1'
36
36
  spec.add_development_dependency 'simplecov', '0.22.0'
37
- spec.add_development_dependency 'simplecov-html', '0.12.3'
37
+ spec.add_development_dependency 'simplecov-html', '0.13.1'
38
38
  end
@@ -1,3 +1,3 @@
1
1
  module BrDanfe
2
- VERSION = '1.2.2'.freeze
2
+ VERSION = '1.2.3'.freeze
3
3
  end
@@ -6,14 +6,14 @@
6
6
  >>
7
7
  endobj
8
8
  2 0 obj
9
- << /Type /Catalog
10
- /Pages 3 0 R
9
+ << /Pages 3 0 R
10
+ /Type /Catalog
11
11
  >>
12
12
  endobj
13
13
  3 0 obj
14
- << /Type /Pages
15
- /Count 1
14
+ << /Count 1
16
15
  /Kids [5 0 R]
16
+ /Type /Pages
17
17
  >>
18
18
  endobj
19
19
  4 0 obj
@@ -487,17 +487,17 @@ Q
487
487
  endstream
488
488
  endobj
489
489
  5 0 obj
490
- << /Type /Page
491
- /Parent 3 0 R
492
- /MediaBox [0 0 595.28 841.89]
493
- /CropBox [0 0 595.28 841.89]
490
+ << /ArtBox [0 0 595.28 841.89]
494
491
  /BleedBox [0 0 595.28 841.89]
495
- /TrimBox [0 0 595.28 841.89]
496
- /ArtBox [0 0 595.28 841.89]
497
492
  /Contents 4 0 R
498
- /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
499
- /Font << >>
493
+ /CropBox [0 0 595.28 841.89]
494
+ /MediaBox [0 0 595.28 841.89]
495
+ /Parent 3 0 R
496
+ /Resources << /Font << >>
497
+ /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
500
498
  >>
499
+ /TrimBox [0 0 595.28 841.89]
500
+ /Type /Page
501
501
  >>
502
502
  endobj
503
503
  xref
@@ -509,9 +509,9 @@ xref
509
509
  0000000215 00000 n
510
510
  0000006108 00000 n
511
511
  trailer
512
- << /Size 6
512
+ << /Info 1 0 R
513
513
  /Root 2 0 R
514
- /Info 1 0 R
514
+ /Size 6
515
515
  >>
516
516
  startxref
517
517
  6392
@@ -6,14 +6,14 @@
6
6
  >>
7
7
  endobj
8
8
  2 0 obj
9
- << /Type /Catalog
10
- /Pages 3 0 R
9
+ << /Pages 3 0 R
10
+ /Type /Catalog
11
11
  >>
12
12
  endobj
13
13
  3 0 obj
14
- << /Type /Pages
15
- /Count 1
14
+ << /Count 1
16
15
  /Kids [5 0 R]
16
+ /Type /Pages
17
17
  >>
18
18
  endobj
19
19
  4 0 obj
@@ -29,17 +29,17 @@ Q
29
29
  endstream
30
30
  endobj
31
31
  5 0 obj
32
- << /Type /Page
33
- /Parent 3 0 R
34
- /MediaBox [0 0 595.28 841.89]
35
- /CropBox [0 0 595.28 841.89]
32
+ << /ArtBox [0 0 595.28 841.89]
36
33
  /BleedBox [0 0 595.28 841.89]
37
- /TrimBox [0 0 595.28 841.89]
38
- /ArtBox [0 0 595.28 841.89]
39
34
  /Contents 4 0 R
40
- /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
41
- /Font << >>
35
+ /CropBox [0 0 595.28 841.89]
36
+ /MediaBox [0 0 595.28 841.89]
37
+ /Parent 3 0 R
38
+ /Resources << /Font << >>
39
+ /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
42
40
  >>
41
+ /TrimBox [0 0 595.28 841.89]
42
+ /Type /Page
43
43
  >>
44
44
  endobj
45
45
  xref
@@ -51,9 +51,9 @@ xref
51
51
  0000000215 00000 n
52
52
  0000000304 00000 n
53
53
  trailer
54
- << /Size 6
54
+ << /Info 1 0 R
55
55
  /Root 2 0 R
56
- /Info 1 0 R
56
+ /Size 6
57
57
  >>
58
58
  startxref
59
59
  588