br_danfe 0.6.0 → 0.6.1

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 (21) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile.lock +10 -10
  3. data/config/locales/pt-BR.yml +3 -3
  4. data/lib/br_danfe/danfe_lib/det_body.rb +14 -13
  5. data/lib/br_danfe/danfe_lib/det_header.rb +14 -14
  6. data/lib/br_danfe/version.rb +1 -1
  7. data/spec/fixtures/nfe/lib/det_body#render-csosn.pdf +197 -260
  8. data/spec/fixtures/nfe/lib/det_body#render-cst.pdf +116 -144
  9. data/spec/fixtures/nfe/lib/det_body#render-fci.pdf +53 -74
  10. data/spec/fixtures/nfe/lib/det_body#render-icms_st.pdf +53 -74
  11. data/spec/fixtures/nfe/lib/det_body#render-quantity_with_custom_precision.pdf +48 -62
  12. data/spec/fixtures/nfe/lib/det_body#render-unit_price_with_custom_precision.pdf +48 -62
  13. data/spec/fixtures/nfe/lib/det_header#render.pdf +35 -35
  14. data/spec/fixtures/nfe/v2.00/custom_options.fixture.pdf +179 -221
  15. data/spec/fixtures/nfe/v2.00/nfe_simples_nacional.xml.fixture.pdf +177 -219
  16. data/spec/fixtures/nfe/v2.00/nfe_with_extra_volumes.xml.fixture.pdf +882 -1092
  17. data/spec/fixtures/nfe/v2.00/nfe_with_fci.xml.fixture.pdf +107 -128
  18. data/spec/fixtures/nfe/v2.00/nfe_with_ns.xml.fixture.pdf +882 -1092
  19. data/spec/fixtures/nfe/v2.00/nfe_without_ns.xml.fixture.pdf +206 -248
  20. data/spec/fixtures/nfe/v3.10/nfe_simples_nacional.xml.fixture.pdf +453 -593
  21. metadata +2 -2
data/spec/fixtures/nfe/v2.00/custom_options.fixture.pdf CHANGED
@@ -17,576 +17,534 @@ endobj
17
17
  >>
18
18
  endobj
19
19
  4 0 obj
20
- << /Length 6852
20
+ << /Length 6228
21
21
  >>
22
22
  stream
23
23
  q
24
24
  0.3 w
25
25
  /Stamp1 Do
26
- [0.3 0.6] 0.0 d
27
26
  0.3 w
28
27
  /DeviceRGB CS
29
28
  0.000 0.000 0.000 SCN
30
- 21.2598 311.8867 m
31
- 63.7795 311.8867 l
29
+ 21.2598 311.3287 m
30
+ 66.6142 311.3287 l
32
31
  S
33
32
  [] 0 d
34
33
  0.3 w
35
34
  0.000 0.000 0.000 SCN
36
35
 
37
36
  BT
38
- 23.2598 315.1857 Td
39
- /F1.0 6 Tf
37
+ 23.2598 314.7359 Td
38
+ /F1.0 6.5 Tf
40
39
  [<31>] TJ
41
40
  ET
42
41
 
43
- [0.3 0.6] 0.0 d
44
42
  0.3 w
45
43
  0.000 0.000 0.000 SCN
46
- 63.7795 311.8867 m
47
- 188.5039 311.8867 l
44
+ 66.6142 311.3287 m
45
+ 239.5276 311.3287 l
48
46
  S
49
47
  [] 0 d
50
48
  0.3 w
51
49
  0.000 0.000 0.000 SCN
52
50
 
53
51
  BT
54
- 65.7795 315.1857 Td
55
- /F1.0 6 Tf
52
+ 68.6142 314.7359 Td
53
+ /F1.0 6.5 Tf
56
54
  [<54> 35 <696a6f6c6f204d616369636f2054> 35 <69706f2041>] TJ
57
55
  ET
58
56
 
59
- [0.3 0.6] 0.0 d
60
57
  0.3 w
61
58
  0.000 0.000 0.000 SCN
62
- 188.5039 311.8867 m
63
- 225.3543 311.8867 l
59
+ 239.5276 311.3287 m
60
+ 269.2913 311.3287 l
64
61
  S
65
62
  [] 0 d
66
63
  0.3 w
67
64
  0.000 0.000 0.000 SCN
68
65
 
69
66
  BT
70
- 190.5039 315.1857 Td
71
- /F1.0 6 Tf
67
+ 241.5276 314.7359 Td
68
+ /F1.0 6.5 Tf
72
69
  [<3639303431303030>] TJ
73
70
  ET
74
71
 
75
- [0.3 0.6] 0.0 d
76
72
  0.3 w
77
73
  0.000 0.000 0.000 SCN
78
- 225.3543 311.8867 m
79
- 248.0315 311.8867 l
74
+ 269.2913 311.3287 m
75
+ 286.2992 311.3287 l
80
76
  S
81
77
  [] 0 d
82
78
  0.3 w
83
79
  0.000 0.000 0.000 SCN
84
80
 
85
81
  BT
86
- 227.3543 315.1857 Td
87
- /F1.0 6 Tf
82
+ 271.2913 314.7359 Td
83
+ /F1.0 6.5 Tf
88
84
  [<30313032>] TJ
89
85
  ET
90
86
 
91
- [0.3 0.6] 0.0 d
92
87
  0.3 w
93
88
  0.000 0.000 0.000 SCN
94
- 248.0315 311.8867 m
95
- 276.378 311.8867 l
89
+ 286.2992 311.3287 m
90
+ 306.1417 311.3287 l
96
91
  S
97
92
  [] 0 d
98
93
  0.3 w
99
94
  0.000 0.000 0.000 SCN
100
95
 
101
96
  BT
102
- 250.0315 315.1857 Td
103
- /F1.0 6 Tf
97
+ 288.2992 314.7359 Td
98
+ /F1.0 6.5 Tf
104
99
  [<36313031>] TJ
105
100
  ET
106
101
 
107
- [0.3 0.6] 0.0 d
108
102
  0.3 w
109
103
  0.000 0.000 0.000 SCN
110
- 276.378 311.8867 m
111
- 304.7244 311.8867 l
104
+ 306.1417 311.3287 m
105
+ 335.9055 311.3287 l
112
106
  S
113
107
  [] 0 d
114
108
  0.3 w
115
109
  0.000 0.000 0.000 SCN
116
110
 
117
111
  BT
118
- 278.378 315.1857 Td
119
- /F1.0 6 Tf
112
+ 308.1417 314.7359 Td
113
+ /F1.0 6.5 Tf
120
114
  [<4d49>] TJ
121
115
  ET
122
116
 
123
- [0.3 0.6] 0.0 d
124
117
  0.3 w
125
118
  0.000 0.000 0.000 SCN
126
- 304.7244 311.8867 m
127
- 341.5748 311.8867 l
119
+ 335.9055 311.3287 m
120
+ 369.9213 311.3287 l
128
121
  S
129
122
  [] 0 d
130
123
  0.3 w
131
124
  0.000 0.000 0.000 SCN
132
125
 
133
126
  BT
134
- 324.0748 315.1857 Td
135
- /F1.0 6 Tf
127
+ 351.0463 314.7359 Td
128
+ /F1.0 6.5 Tf
136
129
  [<322c30303030>] TJ
137
130
  ET
138
131
 
139
- [0.3 0.6] 0.0 d
140
132
  0.3 w
141
133
  0.000 0.000 0.000 SCN
142
- 341.5748 311.8867 m
143
- 384.0945 311.8867 l
134
+ 369.9213 311.3287 m
135
+ 403.937 311.3287 l
144
136
  S
145
137
  [] 0 d
146
138
  0.3 w
147
139
  0.000 0.000 0.000 SCN
148
140
 
149
141
  BT
150
- 363.5945 315.1857 Td
151
- /F1.0 6 Tf
142
+ 381.812 314.7359 Td
143
+ /F1.0 6.5 Tf
152
144
  [<31302c30303030>] TJ
153
145
  ET
154
146
 
155
- [0.3 0.6] 0.0 d
156
147
  0.3 w
157
148
  0.000 0.000 0.000 SCN
158
- 384.0945 311.8867 m
159
- 426.6142 311.8867 l
149
+ 403.937 311.3287 m
150
+ 437.9528 311.3287 l
160
151
  S
161
152
  [] 0 d
162
153
  0.3 w
163
154
  0.000 0.000 0.000 SCN
164
155
 
165
156
  BT
166
- 412.1142 315.1857 Td
167
- /F1.0 6 Tf
157
+ 422.3278 314.7359 Td
158
+ /F1.0 6.5 Tf
168
159
  [<32302c3030>] TJ
169
160
  ET
170
161
 
171
- [0.3 0.6] 0.0 d
172
162
  0.3 w
173
163
  0.000 0.000 0.000 SCN
174
- 426.6142 311.8867 m
175
- 469.1339 311.8867 l
164
+ 437.9528 311.3287 m
165
+ 471.9685 311.3287 l
176
166
  S
177
167
  [] 0 d
178
168
  0.3 w
179
169
  0.000 0.000 0.000 SCN
180
- [0.3 0.6] 0.0 d
181
170
  0.3 w
182
171
  0.000 0.000 0.000 SCN
183
- 469.1339 311.8867 m
184
- 497.4803 311.8867 l
172
+ 471.9685 311.3287 m
173
+ 500.315 311.3287 l
185
174
  S
186
175
  [] 0 d
187
176
  0.3 w
188
177
  0.000 0.000 0.000 SCN
189
- [0.3 0.6] 0.0 d
190
178
  0.3 w
191
179
  0.000 0.000 0.000 SCN
192
- 497.4803 311.8867 m
193
- 525.8268 311.8867 l
180
+ 500.315 311.3287 m
181
+ 528.6614 311.3287 l
194
182
  S
195
183
  [] 0 d
196
184
  0.3 w
197
185
  0.000 0.000 0.000 SCN
198
- [0.3 0.6] 0.0 d
199
186
  0.3 w
200
187
  0.000 0.000 0.000 SCN
201
- 525.8268 311.8867 m
202
- 551.3386 311.8867 l
188
+ 528.6614 311.3287 m
189
+ 554.1732 311.3287 l
203
190
  S
204
191
  [] 0 d
205
192
  0.3 w
206
193
  0.000 0.000 0.000 SCN
207
- [0.3 0.6] 0.0 d
208
194
  0.3 w
209
195
  0.000 0.000 0.000 SCN
210
- 551.3386 311.8867 m
211
- 575.7165 311.8867 l
196
+ 554.1732 311.3287 m
197
+ 575.7165 311.3287 l
212
198
  S
213
199
  [] 0 d
214
200
  0.3 w
215
201
  0.000 0.000 0.000 SCN
216
- [0.3 0.6] 0.0 d
217
202
  0.3 w
218
203
  0.000 0.000 0.000 SCN
219
- 21.2598 301.1907 m
220
- 63.7795 301.1907 l
204
+ 21.2598 300.0747 m
205
+ 66.6142 300.0747 l
221
206
  S
222
207
  [] 0 d
223
208
  0.3 w
224
209
  0.000 0.000 0.000 SCN
225
210
 
226
211
  BT
227
- 23.2598 304.4897 Td
228
- /F1.0 6 Tf
212
+ 23.2598 303.4819 Td
213
+ /F1.0 6.5 Tf
229
214
  [<32>] TJ
230
215
  ET
231
216
 
232
- [0.3 0.6] 0.0 d
233
217
  0.3 w
234
218
  0.000 0.000 0.000 SCN
235
- 63.7795 301.1907 m
236
- 188.5039 301.1907 l
219
+ 66.6142 300.0747 m
220
+ 239.5276 300.0747 l
237
221
  S
238
222
  [] 0 d
239
223
  0.3 w
240
224
  0.000 0.000 0.000 SCN
241
225
 
242
226
  BT
243
- 65.7795 304.4897 Td
244
- /F1.0 6 Tf
227
+ 68.6142 303.4819 Td
228
+ /F1.0 6.5 Tf
245
229
  [<54> 35 <696a6f6c6f204d616369636f2054> 35 <69706f2042>] TJ
246
230
  ET
247
231
 
248
- [0.3 0.6] 0.0 d
249
232
  0.3 w
250
233
  0.000 0.000 0.000 SCN
251
- 188.5039 301.1907 m
252
- 225.3543 301.1907 l
234
+ 239.5276 300.0747 m
235
+ 269.2913 300.0747 l
253
236
  S
254
237
  [] 0 d
255
238
  0.3 w
256
239
  0.000 0.000 0.000 SCN
257
240
 
258
241
  BT
259
- 190.5039 304.4897 Td
260
- /F1.0 6 Tf
242
+ 241.5276 303.4819 Td
243
+ /F1.0 6.5 Tf
261
244
  [<3639303431303030>] TJ
262
245
  ET
263
246
 
264
- [0.3 0.6] 0.0 d
265
247
  0.3 w
266
248
  0.000 0.000 0.000 SCN
267
- 225.3543 301.1907 m
268
- 248.0315 301.1907 l
249
+ 269.2913 300.0747 m
250
+ 286.2992 300.0747 l
269
251
  S
270
252
  [] 0 d
271
253
  0.3 w
272
254
  0.000 0.000 0.000 SCN
273
255
 
274
256
  BT
275
- 227.3543 304.4897 Td
276
- /F1.0 6 Tf
257
+ 271.2913 303.4819 Td
258
+ /F1.0 6.5 Tf
277
259
  [<30313032>] TJ
278
260
  ET
279
261
 
280
- [0.3 0.6] 0.0 d
281
262
  0.3 w
282
263
  0.000 0.000 0.000 SCN
283
- 248.0315 301.1907 m
284
- 276.378 301.1907 l
264
+ 286.2992 300.0747 m
265
+ 306.1417 300.0747 l
285
266
  S
286
267
  [] 0 d
287
268
  0.3 w
288
269
  0.000 0.000 0.000 SCN
289
270
 
290
271
  BT
291
- 250.0315 304.4897 Td
292
- /F1.0 6 Tf
272
+ 288.2992 303.4819 Td
273
+ /F1.0 6.5 Tf
293
274
  [<36313031>] TJ
294
275
  ET
295
276
 
296
- [0.3 0.6] 0.0 d
297
277
  0.3 w
298
278
  0.000 0.000 0.000 SCN
299
- 276.378 301.1907 m
300
- 304.7244 301.1907 l
279
+ 306.1417 300.0747 m
280
+ 335.9055 300.0747 l
301
281
  S
302
282
  [] 0 d
303
283
  0.3 w
304
284
  0.000 0.000 0.000 SCN
305
285
 
306
286
  BT
307
- 278.378 304.4897 Td
308
- /F1.0 6 Tf
287
+ 308.1417 303.4819 Td
288
+ /F1.0 6.5 Tf
309
289
  [<4d49>] TJ
310
290
  ET
311
291
 
312
- [0.3 0.6] 0.0 d
313
292
  0.3 w
314
293
  0.000 0.000 0.000 SCN
315
- 304.7244 301.1907 m
316
- 341.5748 301.1907 l
294
+ 335.9055 300.0747 m
295
+ 369.9213 300.0747 l
317
296
  S
318
297
  [] 0 d
319
298
  0.3 w
320
299
  0.000 0.000 0.000 SCN
321
300
 
322
301
  BT
323
- 324.0748 304.4897 Td
324
- /F1.0 6 Tf
302
+ 351.0463 303.4819 Td
303
+ /F1.0 6.5 Tf
325
304
  [<332c30303030>] TJ
326
305
  ET
327
306
 
328
- [0.3 0.6] 0.0 d
329
307
  0.3 w
330
308
  0.000 0.000 0.000 SCN
331
- 341.5748 301.1907 m
332
- 384.0945 301.1907 l
309
+ 369.9213 300.0747 m
310
+ 403.937 300.0747 l
333
311
  S
334
312
  [] 0 d
335
313
  0.3 w
336
314
  0.000 0.000 0.000 SCN
337
315
 
338
316
  BT
339
- 363.5945 304.4897 Td
340
- /F1.0 6 Tf
317
+ 381.812 303.4819 Td
318
+ /F1.0 6.5 Tf
341
319
  [<32302c30303030>] TJ
342
320
  ET
343
321
 
344
- [0.3 0.6] 0.0 d
345
322
  0.3 w
346
323
  0.000 0.000 0.000 SCN
347
- 384.0945 301.1907 m
348
- 426.6142 301.1907 l
324
+ 403.937 300.0747 m
325
+ 437.9528 300.0747 l
349
326
  S
350
327
  [] 0 d
351
328
  0.3 w
352
329
  0.000 0.000 0.000 SCN
353
330
 
354
331
  BT
355
- 412.1142 304.4897 Td
356
- /F1.0 6 Tf
332
+ 422.3278 303.4819 Td
333
+ /F1.0 6.5 Tf
357
334
  [<36302c3030>] TJ
358
335
  ET
359
336
 
360
- [0.3 0.6] 0.0 d
361
337
  0.3 w
362
338
  0.000 0.000 0.000 SCN
363
- 426.6142 301.1907 m
364
- 469.1339 301.1907 l
339
+ 437.9528 300.0747 m
340
+ 471.9685 300.0747 l
365
341
  S
366
342
  [] 0 d
367
343
  0.3 w
368
344
  0.000 0.000 0.000 SCN
369
- [0.3 0.6] 0.0 d
370
345
  0.3 w
371
346
  0.000 0.000 0.000 SCN
372
- 469.1339 301.1907 m
373
- 497.4803 301.1907 l
347
+ 471.9685 300.0747 m
348
+ 500.315 300.0747 l
374
349
  S
375
350
  [] 0 d
376
351
  0.3 w
377
352
  0.000 0.000 0.000 SCN
378
- [0.3 0.6] 0.0 d
379
353
  0.3 w
380
354
  0.000 0.000 0.000 SCN
381
- 497.4803 301.1907 m
382
- 525.8268 301.1907 l
355
+ 500.315 300.0747 m
356
+ 528.6614 300.0747 l
383
357
  S
384
358
  [] 0 d
385
359
  0.3 w
386
360
  0.000 0.000 0.000 SCN
387
- [0.3 0.6] 0.0 d
388
361
  0.3 w
389
362
  0.000 0.000 0.000 SCN
390
- 525.8268 301.1907 m
391
- 551.3386 301.1907 l
363
+ 528.6614 300.0747 m
364
+ 554.1732 300.0747 l
392
365
  S
393
366
  [] 0 d
394
367
  0.3 w
395
368
  0.000 0.000 0.000 SCN
396
- [0.3 0.6] 0.0 d
397
369
  0.3 w
398
370
  0.000 0.000 0.000 SCN
399
- 551.3386 301.1907 m
400
- 575.7165 301.1907 l
371
+ 554.1732 300.0747 m
372
+ 575.7165 300.0747 l
401
373
  S
402
374
  [] 0 d
403
375
  0.3 w
404
376
  0.000 0.000 0.000 SCN
405
- [0.3 0.6] 0.0 d
406
377
  0.3 w
407
378
  0.000 0.000 0.000 SCN
408
- 21.2598 290.4947 m
409
- 63.7795 290.4947 l
379
+ 21.2598 288.8207 m
380
+ 66.6142 288.8207 l
410
381
  S
411
382
  [] 0 d
412
383
  0.3 w
413
384
  0.000 0.000 0.000 SCN
414
385
 
415
386
  BT
416
- 23.2598 293.7937 Td
417
- /F1.0 6 Tf
387
+ 23.2598 292.2279 Td
388
+ /F1.0 6.5 Tf
418
389
  [<33>] TJ
419
390
  ET
420
391
 
421
- [0.3 0.6] 0.0 d
422
392
  0.3 w
423
393
  0.000 0.000 0.000 SCN
424
- 63.7795 290.4947 m
425
- 188.5039 290.4947 l
394
+ 66.6142 288.8207 m
395
+ 239.5276 288.8207 l
426
396
  S
427
397
  [] 0 d
428
398
  0.3 w
429
399
  0.000 0.000 0.000 SCN
430
400
 
431
401
  BT
432
- 65.7795 293.7937 Td
433
- /F1.0 6 Tf
402
+ 68.6142 292.2279 Td
403
+ /F1.0 6.5 Tf
434
404
  [<54> 35 <696a6f6c6f204d616369636f2054> 35 <69706f2043>] TJ
435
405
  ET
436
406
 
437
- [0.3 0.6] 0.0 d
438
407
  0.3 w
439
408
  0.000 0.000 0.000 SCN
440
- 188.5039 290.4947 m
441
- 225.3543 290.4947 l
409
+ 239.5276 288.8207 m
410
+ 269.2913 288.8207 l
442
411
  S
443
412
  [] 0 d
444
413
  0.3 w
445
414
  0.000 0.000 0.000 SCN
446
415
 
447
416
  BT
448
- 190.5039 293.7937 Td
449
- /F1.0 6 Tf
417
+ 241.5276 292.2279 Td
418
+ /F1.0 6.5 Tf
450
419
  [<3639303431303030>] TJ
451
420
  ET
452
421
 
453
- [0.3 0.6] 0.0 d
454
422
  0.3 w
455
423
  0.000 0.000 0.000 SCN
456
- 225.3543 290.4947 m
457
- 248.0315 290.4947 l
424
+ 269.2913 288.8207 m
425
+ 286.2992 288.8207 l
458
426
  S
459
427
  [] 0 d
460
428
  0.3 w
461
429
  0.000 0.000 0.000 SCN
462
430
 
463
431
  BT
464
- 227.3543 293.7937 Td
465
- /F1.0 6 Tf
432
+ 271.2913 292.2279 Td
433
+ /F1.0 6.5 Tf
466
434
  [<30313032>] TJ
467
435
  ET
468
436
 
469
- [0.3 0.6] 0.0 d
470
437
  0.3 w
471
438
  0.000 0.000 0.000 SCN
472
- 248.0315 290.4947 m
473
- 276.378 290.4947 l
439
+ 286.2992 288.8207 m
440
+ 306.1417 288.8207 l
474
441
  S
475
442
  [] 0 d
476
443
  0.3 w
477
444
  0.000 0.000 0.000 SCN
478
445
 
479
446
  BT
480
- 250.0315 293.7937 Td
481
- /F1.0 6 Tf
447
+ 288.2992 292.2279 Td
448
+ /F1.0 6.5 Tf
482
449
  [<36313031>] TJ
483
450
  ET
484
451
 
485
- [0.3 0.6] 0.0 d
486
452
  0.3 w
487
453
  0.000 0.000 0.000 SCN
488
- 276.378 290.4947 m
489
- 304.7244 290.4947 l
454
+ 306.1417 288.8207 m
455
+ 335.9055 288.8207 l
490
456
  S
491
457
  [] 0 d
492
458
  0.3 w
493
459
  0.000 0.000 0.000 SCN
494
460
 
495
461
  BT
496
- 278.378 293.7937 Td
497
- /F1.0 6 Tf
462
+ 308.1417 292.2279 Td
463
+ /F1.0 6.5 Tf
498
464
  [<4d49>] TJ
499
465
  ET
500
466
 
501
- [0.3 0.6] 0.0 d
502
467
  0.3 w
503
468
  0.000 0.000 0.000 SCN
504
- 304.7244 290.4947 m
505
- 341.5748 290.4947 l
469
+ 335.9055 288.8207 m
470
+ 369.9213 288.8207 l
506
471
  S
507
472
  [] 0 d
508
473
  0.3 w
509
474
  0.000 0.000 0.000 SCN
510
475
 
511
476
  BT
512
- 324.0748 293.7937 Td
513
- /F1.0 6 Tf
477
+ 351.0463 292.2279 Td
478
+ /F1.0 6.5 Tf
514
479
  [<342c30303030>] TJ
515
480
  ET
516
481
 
517
- [0.3 0.6] 0.0 d
518
482
  0.3 w
519
483
  0.000 0.000 0.000 SCN
520
- 341.5748 290.4947 m
521
- 384.0945 290.4947 l
484
+ 369.9213 288.8207 m
485
+ 403.937 288.8207 l
522
486
  S
523
487
  [] 0 d
524
488
  0.3 w
525
489
  0.000 0.000 0.000 SCN
526
490
 
527
491
  BT
528
- 363.5945 293.7937 Td
529
- /F1.0 6 Tf
492
+ 381.812 292.2279 Td
493
+ /F1.0 6.5 Tf
530
494
  [<33302c30303030>] TJ
531
495
  ET
532
496
 
533
- [0.3 0.6] 0.0 d
534
497
  0.3 w
535
498
  0.000 0.000 0.000 SCN
536
- 384.0945 290.4947 m
537
- 426.6142 290.4947 l
499
+ 403.937 288.8207 m
500
+ 437.9528 288.8207 l
538
501
  S
539
502
  [] 0 d
540
503
  0.3 w
541
504
  0.000 0.000 0.000 SCN
542
505
 
543
506
  BT
544
- 409.1142 293.7937 Td
545
- /F1.0 6 Tf
507
+ 419.0778 292.2279 Td
508
+ /F1.0 6.5 Tf
546
509
  [<3132302c3030>] TJ
547
510
  ET
548
511
 
549
- [0.3 0.6] 0.0 d
550
512
  0.3 w
551
513
  0.000 0.000 0.000 SCN
552
- 426.6142 290.4947 m
553
- 469.1339 290.4947 l
514
+ 437.9528 288.8207 m
515
+ 471.9685 288.8207 l
554
516
  S
555
517
  [] 0 d
556
518
  0.3 w
557
519
  0.000 0.000 0.000 SCN
558
- [0.3 0.6] 0.0 d
559
520
  0.3 w
560
521
  0.000 0.000 0.000 SCN
561
- 469.1339 290.4947 m
562
- 497.4803 290.4947 l
522
+ 471.9685 288.8207 m
523
+ 500.315 288.8207 l
563
524
  S
564
525
  [] 0 d
565
526
  0.3 w
566
527
  0.000 0.000 0.000 SCN
567
- [0.3 0.6] 0.0 d
568
528
  0.3 w
569
529
  0.000 0.000 0.000 SCN
570
- 497.4803 290.4947 m
571
- 525.8268 290.4947 l
530
+ 500.315 288.8207 m
531
+ 528.6614 288.8207 l
572
532
  S
573
533
  [] 0 d
574
534
  0.3 w
575
535
  0.000 0.000 0.000 SCN
576
- [0.3 0.6] 0.0 d
577
536
  0.3 w
578
537
  0.000 0.000 0.000 SCN
579
- 525.8268 290.4947 m
580
- 551.3386 290.4947 l
538
+ 528.6614 288.8207 m
539
+ 554.1732 288.8207 l
581
540
  S
582
541
  [] 0 d
583
542
  0.3 w
584
543
  0.000 0.000 0.000 SCN
585
- [0.3 0.6] 0.0 d
586
544
  0.3 w
587
545
  0.000 0.000 0.000 SCN
588
- 551.3386 290.4947 m
589
- 575.7165 290.4947 l
546
+ 554.1732 288.8207 m
547
+ 575.7165 288.8207 l
590
548
  S
591
549
  [] 0 d
592
550
  0.3 w
@@ -674,7 +632,7 @@ endobj
674
632
  /XObject << /I1 10 0 R
675
633
  >>
676
634
  >>
677
- /Length 15414
635
+ /Length 15387
678
636
  >>
679
637
  stream
680
638
  q
@@ -1688,7 +1646,7 @@ BT
1688
1646
  [<44> 35 <41444f5320444f205052> 30 <4f445554> 18 <4f202f20534552> 55 <5649c74f>] TJ
1689
1647
  ET
1690
1648
 
1691
- 21.2598 148.5354 42.5197 181.4173 re
1649
+ 21.2598 148.5354 45.3543 181.4173 re
1692
1650
  S
1693
1651
 
1694
1652
  BT
@@ -1697,119 +1655,119 @@ BT
1697
1655
  [<43d34449474f>] TJ
1698
1656
  ET
1699
1657
 
1700
- 63.7795 148.5354 124.7244 181.4173 re
1658
+ 66.6142 148.5354 172.9134 181.4173 re
1701
1659
  S
1702
1660
 
1703
1661
  BT
1704
- 65.7795 323.8548 Td
1662
+ 68.6142 323.8548 Td
1705
1663
  /F1.0 6 Tf
1706
1664
  [<444553435249c7c3> 55 <4f>] TJ
1707
1665
  ET
1708
1666
 
1709
- 188.5039 148.5354 36.8504 181.4173 re
1667
+ 239.5276 148.5354 29.7638 181.4173 re
1710
1668
  S
1711
1669
 
1712
1670
  BT
1713
- 190.5039 323.8548 Td
1671
+ 241.5276 323.8548 Td
1714
1672
  /F1.0 6 Tf
1715
1673
  [<4e434d>] TJ
1716
1674
  ET
1717
1675
 
1718
- 225.3543 148.5354 22.6772 181.4173 re
1676
+ 269.2913 148.5354 17.0079 181.4173 re
1719
1677
  S
1720
1678
 
1721
1679
  BT
1722
- 227.3543 323.8548 Td
1680
+ 271.2913 323.8548 Td
1723
1681
  /F1.0 6 Tf
1724
1682
  [<435354>] TJ
1725
1683
  ET
1726
1684
 
1727
- 248.0315 148.5354 28.3465 181.4173 re
1685
+ 286.2992 148.5354 19.8425 181.4173 re
1728
1686
  S
1729
1687
 
1730
1688
  BT
1731
- 250.0315 323.8548 Td
1689
+ 288.2992 323.8548 Td
1732
1690
  /F1.0 6 Tf
1733
1691
  [<43464f50>] TJ
1734
1692
  ET
1735
1693
 
1736
- 276.378 148.5354 28.3465 181.4173 re
1694
+ 306.1417 148.5354 29.7638 181.4173 re
1737
1695
  S
1738
1696
 
1739
1697
  BT
1740
- 278.378 323.8548 Td
1698
+ 308.1417 323.8548 Td
1741
1699
  /F1.0 6 Tf
1742
1700
  [<554e4944>] TJ
1743
1701
  ET
1744
1702
 
1745
- 304.7244 148.5354 36.8504 181.4173 re
1703
+ 335.9055 148.5354 34.0157 181.4173 re
1746
1704
  S
1747
1705
 
1748
1706
  BT
1749
- 306.7244 323.8548 Td
1707
+ 337.9055 323.8548 Td
1750
1708
  /F1.0 6 Tf
1751
1709
  [<51> 10 <55> 40 <414e54>] TJ
1752
1710
  ET
1753
1711
 
1754
- 341.5748 148.5354 42.5197 181.4173 re
1712
+ 369.9213 148.5354 34.0157 181.4173 re
1755
1713
  S
1756
1714
 
1757
1715
  BT
1758
- 343.5748 323.8548 Td
1716
+ 371.9213 323.8548 Td
1759
1717
  /F1.0 6 Tf
1760
- [<56> 135 <414c4f5220554e4954>] TJ
1718
+ [<564c20554e4954>] TJ
1761
1719
  ET
1762
1720
 
1763
- 384.0945 148.5354 42.5197 181.4173 re
1721
+ 403.937 148.5354 34.0157 181.4173 re
1764
1722
  S
1765
1723
 
1766
1724
  BT
1767
- 386.0945 323.8548 Td
1725
+ 405.937 323.8548 Td
1768
1726
  /F1.0 6 Tf
1769
- [<56> 135 <414c4f522054> 18 <4f> 40 <54>] TJ
1727
+ [<564c2054> 18 <4f> 40 <54> 93 <414c>] TJ
1770
1728
  ET
1771
1729
 
1772
- 426.6142 148.5354 42.5197 181.4173 re
1730
+ 437.9528 148.5354 34.0157 181.4173 re
1773
1731
  S
1774
1732
 
1775
1733
  BT
1776
- 428.6142 323.8548 Td
1734
+ 439.9528 323.8548 Td
1777
1735
  /F1.0 6 Tf
1778
- [<42> 35 <4153452043c14c43>] TJ
1736
+ [<42432049434d53>] TJ
1779
1737
  ET
1780
1738
 
1781
- 469.1339 148.5354 28.3465 181.4173 re
1739
+ 471.9685 148.5354 28.3465 181.4173 re
1782
1740
  S
1783
1741
 
1784
1742
  BT
1785
- 471.1339 323.8548 Td
1743
+ 473.9685 323.8548 Td
1786
1744
  /F1.0 6 Tf
1787
1745
  [<564c2049434d53>] TJ
1788
1746
  ET
1789
1747
 
1790
- 497.4803 148.5354 28.3465 181.4173 re
1748
+ 500.315 148.5354 28.3465 181.4173 re
1791
1749
  S
1792
1750
 
1793
1751
  BT
1794
- 499.4803 323.8548 Td
1752
+ 502.315 323.8548 Td
1795
1753
  /F1.0 6 Tf
1796
1754
  [<564c20495049>] TJ
1797
1755
  ET
1798
1756
 
1799
- 525.8268 148.5354 25.5118 181.4173 re
1757
+ 528.6614 148.5354 25.5118 181.4173 re
1800
1758
  S
1801
1759
 
1802
1760
  BT
1803
- 527.8268 323.8548 Td
1761
+ 530.6614 323.8548 Td
1804
1762
  /F1.0 6 Tf
1805
1763
  [<252049434d53>] TJ
1806
1764
  ET
1807
1765
 
1808
- 551.3386 148.5354 24.378 181.4173 re
1766
+ 554.1732 148.5354 21.5433 181.4173 re
1809
1767
  S
1810
1768
 
1811
1769
  BT
1812
- 553.3386 323.8548 Td
1770
+ 556.1732 323.8548 Td
1813
1771
  /F1.0 6 Tf
1814
1772
  [<2520495049>] TJ
1815
1773
  ET
@@ -1976,19 +1934,19 @@ xref
1976
1934
  0000000109 00000 n
1977
1935
  0000000158 00000 n
1978
1936
  0000000215 00000 n
1979
- 0000007119 00000 n
1980
- 0000007354 00000 n
1981
- 0000007851 00000 n
1982
- 0000007950 00000 n
1983
- 0000023565 00000 n
1984
- 0000023663 00000 n
1985
- 0000026052 00000 n
1986
- 0000026427 00000 n
1937
+ 0000006495 00000 n
1938
+ 0000006730 00000 n
1939
+ 0000007227 00000 n
1940
+ 0000007326 00000 n
1941
+ 0000022914 00000 n
1942
+ 0000023012 00000 n
1943
+ 0000025401 00000 n
1944
+ 0000025776 00000 n
1987
1945
  trailer
1988
1946
  << /Size 13
1989
1947
  /Root 2 0 R
1990
1948
  /Info 1 0 R
1991
1949
  >>
1992
1950
  startxref
1993
- 26528
1951
+ 25877
1994
1952
  %%EOF