br_danfe 0.6.0 → 0.6.1

Sign up to get free protection for your applications and to get access to all the features.
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/lib/det_body#render-quantity_with_custom_precision.pdf CHANGED
@@ -17,190 +17,176 @@ endobj
17
17
  >>
18
18
  endobj
19
19
  4 0 obj
20
- << /Length 2214
20
+ << /Length 2004
21
21
  >>
22
22
  stream
23
23
  q
24
24
  0.3 w
25
- [0.3 0.6] 0.0 d
26
25
  0.3 w
27
26
  /DeviceRGB CS
28
27
  0.000 0.000 0.000 SCN
29
- 21.2598 311.8867 m
30
- 63.7795 311.8867 l
28
+ 21.2598 311.3287 m
29
+ 66.6142 311.3287 l
31
30
  S
32
31
  [] 0 d
33
32
  0.3 w
34
33
  0.000 0.000 0.000 SCN
35
34
 
36
35
  BT
37
- 23.2598 315.1857 Td
38
- /F1.0 6 Tf
36
+ 23.2598 314.7359 Td
37
+ /F1.0 6.5 Tf
39
38
  [<33>] TJ
40
39
  ET
41
40
 
42
- [0.3 0.6] 0.0 d
43
41
  0.3 w
44
42
  0.000 0.000 0.000 SCN
45
- 63.7795 311.8867 m
46
- 188.5039 311.8867 l
43
+ 66.6142 311.3287 m
44
+ 239.5276 311.3287 l
47
45
  S
48
46
  [] 0 d
49
47
  0.3 w
50
48
  0.000 0.000 0.000 SCN
51
49
 
52
50
  BT
53
- 65.7795 315.1857 Td
54
- /F1.0 6 Tf
51
+ 68.6142 314.7359 Td
52
+ /F1.0 6.5 Tf
55
53
  [<50726f6475746f20436f6d2043736f736e20323031202d2049434d53205354>] TJ
56
54
  ET
57
55
 
58
- [0.3 0.6] 0.0 d
59
56
  0.3 w
60
57
  0.000 0.000 0.000 SCN
61
- 188.5039 311.8867 m
62
- 225.3543 311.8867 l
58
+ 239.5276 311.3287 m
59
+ 269.2913 311.3287 l
63
60
  S
64
61
  [] 0 d
65
62
  0.3 w
66
63
  0.000 0.000 0.000 SCN
67
64
 
68
65
  BT
69
- 190.5039 315.1857 Td
70
- /F1.0 6 Tf
66
+ 241.5276 314.7359 Td
67
+ /F1.0 6.5 Tf
71
68
  [<3435363738393031>] TJ
72
69
  ET
73
70
 
74
- [0.3 0.6] 0.0 d
75
71
  0.3 w
76
72
  0.000 0.000 0.000 SCN
77
- 225.3543 311.8867 m
78
- 248.0315 311.8867 l
73
+ 269.2913 311.3287 m
74
+ 286.2992 311.3287 l
79
75
  S
80
76
  [] 0 d
81
77
  0.3 w
82
78
  0.000 0.000 0.000 SCN
83
- [0.3 0.6] 0.0 d
84
79
  0.3 w
85
80
  0.000 0.000 0.000 SCN
86
- 248.0315 311.8867 m
87
- 276.378 311.8867 l
81
+ 286.2992 311.3287 m
82
+ 306.1417 311.3287 l
88
83
  S
89
84
  [] 0 d
90
85
  0.3 w
91
86
  0.000 0.000 0.000 SCN
92
87
 
93
88
  BT
94
- 250.0315 315.1857 Td
95
- /F1.0 6 Tf
89
+ 288.2992 314.7359 Td
90
+ /F1.0 6.5 Tf
96
91
  [<35343031>] TJ
97
92
  ET
98
93
 
99
- [0.3 0.6] 0.0 d
100
94
  0.3 w
101
95
  0.000 0.000 0.000 SCN
102
- 276.378 311.8867 m
103
- 304.7244 311.8867 l
96
+ 306.1417 311.3287 m
97
+ 335.9055 311.3287 l
104
98
  S
105
99
  [] 0 d
106
100
  0.3 w
107
101
  0.000 0.000 0.000 SCN
108
102
 
109
103
  BT
110
- 278.378 315.1857 Td
111
- /F1.0 6 Tf
104
+ 308.1417 314.7359 Td
105
+ /F1.0 6.5 Tf
112
106
  [<554e>] TJ
113
107
  ET
114
108
 
115
- [0.3 0.6] 0.0 d
116
109
  0.3 w
117
110
  0.000 0.000 0.000 SCN
118
- 304.7244 311.8867 m
119
- 341.5748 311.8867 l
111
+ 335.9055 311.3287 m
112
+ 369.9213 311.3287 l
120
113
  S
121
114
  [] 0 d
122
115
  0.3 w
123
116
  0.000 0.000 0.000 SCN
124
117
 
125
118
  BT
126
- 324.0748 315.1857 Td
127
- /F1.0 6 Tf
119
+ 351.0463 314.7359 Td
120
+ /F1.0 6.5 Tf
128
121
  [<362c34353435>] TJ
129
122
  ET
130
123
 
131
- [0.3 0.6] 0.0 d
132
124
  0.3 w
133
125
  0.000 0.000 0.000 SCN
134
- 341.5748 311.8867 m
135
- 384.0945 311.8867 l
126
+ 369.9213 311.3287 m
127
+ 403.937 311.3287 l
136
128
  S
137
129
  [] 0 d
138
130
  0.3 w
139
131
  0.000 0.000 0.000 SCN
140
132
 
141
133
  BT
142
- 372.5945 315.1857 Td
143
- /F1.0 6 Tf
134
+ 391.562 314.7359 Td
135
+ /F1.0 6.5 Tf
144
136
  [<312c3033>] TJ
145
137
  ET
146
138
 
147
- [0.3 0.6] 0.0 d
148
139
  0.3 w
149
140
  0.000 0.000 0.000 SCN
150
- 384.0945 311.8867 m
151
- 426.6142 311.8867 l
141
+ 403.937 311.3287 m
142
+ 437.9528 311.3287 l
152
143
  S
153
144
  [] 0 d
154
145
  0.3 w
155
146
  0.000 0.000 0.000 SCN
156
147
 
157
148
  BT
158
- 415.1142 315.1857 Td
159
- /F1.0 6 Tf
149
+ 425.5778 314.7359 Td
150
+ /F1.0 6.5 Tf
160
151
  [<362c3635>] TJ
161
152
  ET
162
153
 
163
- [0.3 0.6] 0.0 d
164
154
  0.3 w
165
155
  0.000 0.000 0.000 SCN
166
- 426.6142 311.8867 m
167
- 469.1339 311.8867 l
156
+ 437.9528 311.3287 m
157
+ 471.9685 311.3287 l
168
158
  S
169
159
  [] 0 d
170
160
  0.3 w
171
161
  0.000 0.000 0.000 SCN
172
- [0.3 0.6] 0.0 d
173
162
  0.3 w
174
163
  0.000 0.000 0.000 SCN
175
- 469.1339 311.8867 m
176
- 497.4803 311.8867 l
164
+ 471.9685 311.3287 m
165
+ 500.315 311.3287 l
177
166
  S
178
167
  [] 0 d
179
168
  0.3 w
180
169
  0.000 0.000 0.000 SCN
181
- [0.3 0.6] 0.0 d
182
170
  0.3 w
183
171
  0.000 0.000 0.000 SCN
184
- 497.4803 311.8867 m
185
- 525.8268 311.8867 l
172
+ 500.315 311.3287 m
173
+ 528.6614 311.3287 l
186
174
  S
187
175
  [] 0 d
188
176
  0.3 w
189
177
  0.000 0.000 0.000 SCN
190
- [0.3 0.6] 0.0 d
191
178
  0.3 w
192
179
  0.000 0.000 0.000 SCN
193
- 525.8268 311.8867 m
194
- 551.3386 311.8867 l
180
+ 528.6614 311.3287 m
181
+ 554.1732 311.3287 l
195
182
  S
196
183
  [] 0 d
197
184
  0.3 w
198
185
  0.000 0.000 0.000 SCN
199
- [0.3 0.6] 0.0 d
200
186
  0.3 w
201
187
  0.000 0.000 0.000 SCN
202
- 551.3386 311.8867 m
203
- 575.7165 311.8867 l
188
+ 554.1732 311.3287 m
189
+ 575.7165 311.3287 l
204
190
  S
205
191
  [] 0 d
206
192
  0.3 w
@@ -234,13 +220,13 @@ xref
234
220
  0000000109 00000 n
235
221
  0000000158 00000 n
236
222
  0000000215 00000 n
237
- 0000002481 00000 n
238
- 0000002661 00000 n
223
+ 0000002271 00000 n
224
+ 0000002451 00000 n
239
225
  trailer
240
226
  << /Size 7
241
227
  /Root 2 0 R
242
228
  /Info 1 0 R
243
229
  >>
244
230
  startxref
245
- 2760
231
+ 2550
246
232
  %%EOF
data/spec/fixtures/nfe/lib/det_body#render-unit_price_with_custom_precision.pdf CHANGED
@@ -17,190 +17,176 @@ endobj
17
17
  >>
18
18
  endobj
19
19
  4 0 obj
20
- << /Length 2214
20
+ << /Length 2004
21
21
  >>
22
22
  stream
23
23
  q
24
24
  0.3 w
25
- [0.3 0.6] 0.0 d
26
25
  0.3 w
27
26
  /DeviceRGB CS
28
27
  0.000 0.000 0.000 SCN
29
- 21.2598 311.8867 m
30
- 63.7795 311.8867 l
28
+ 21.2598 311.3287 m
29
+ 66.6142 311.3287 l
31
30
  S
32
31
  [] 0 d
33
32
  0.3 w
34
33
  0.000 0.000 0.000 SCN
35
34
 
36
35
  BT
37
- 23.2598 315.1857 Td
38
- /F1.0 6 Tf
36
+ 23.2598 314.7359 Td
37
+ /F1.0 6.5 Tf
39
38
  [<33>] TJ
40
39
  ET
41
40
 
42
- [0.3 0.6] 0.0 d
43
41
  0.3 w
44
42
  0.000 0.000 0.000 SCN
45
- 63.7795 311.8867 m
46
- 188.5039 311.8867 l
43
+ 66.6142 311.3287 m
44
+ 239.5276 311.3287 l
47
45
  S
48
46
  [] 0 d
49
47
  0.3 w
50
48
  0.000 0.000 0.000 SCN
51
49
 
52
50
  BT
53
- 65.7795 315.1857 Td
54
- /F1.0 6 Tf
51
+ 68.6142 314.7359 Td
52
+ /F1.0 6.5 Tf
55
53
  [<50726f6475746f20436f6d2043736f736e20323031202d2049434d53205354>] TJ
56
54
  ET
57
55
 
58
- [0.3 0.6] 0.0 d
59
56
  0.3 w
60
57
  0.000 0.000 0.000 SCN
61
- 188.5039 311.8867 m
62
- 225.3543 311.8867 l
58
+ 239.5276 311.3287 m
59
+ 269.2913 311.3287 l
63
60
  S
64
61
  [] 0 d
65
62
  0.3 w
66
63
  0.000 0.000 0.000 SCN
67
64
 
68
65
  BT
69
- 190.5039 315.1857 Td
70
- /F1.0 6 Tf
66
+ 241.5276 314.7359 Td
67
+ /F1.0 6.5 Tf
71
68
  [<3435363738393031>] TJ
72
69
  ET
73
70
 
74
- [0.3 0.6] 0.0 d
75
71
  0.3 w
76
72
  0.000 0.000 0.000 SCN
77
- 225.3543 311.8867 m
78
- 248.0315 311.8867 l
73
+ 269.2913 311.3287 m
74
+ 286.2992 311.3287 l
79
75
  S
80
76
  [] 0 d
81
77
  0.3 w
82
78
  0.000 0.000 0.000 SCN
83
- [0.3 0.6] 0.0 d
84
79
  0.3 w
85
80
  0.000 0.000 0.000 SCN
86
- 248.0315 311.8867 m
87
- 276.378 311.8867 l
81
+ 286.2992 311.3287 m
82
+ 306.1417 311.3287 l
88
83
  S
89
84
  [] 0 d
90
85
  0.3 w
91
86
  0.000 0.000 0.000 SCN
92
87
 
93
88
  BT
94
- 250.0315 315.1857 Td
95
- /F1.0 6 Tf
89
+ 288.2992 314.7359 Td
90
+ /F1.0 6.5 Tf
96
91
  [<35343031>] TJ
97
92
  ET
98
93
 
99
- [0.3 0.6] 0.0 d
100
94
  0.3 w
101
95
  0.000 0.000 0.000 SCN
102
- 276.378 311.8867 m
103
- 304.7244 311.8867 l
96
+ 306.1417 311.3287 m
97
+ 335.9055 311.3287 l
104
98
  S
105
99
  [] 0 d
106
100
  0.3 w
107
101
  0.000 0.000 0.000 SCN
108
102
 
109
103
  BT
110
- 278.378 315.1857 Td
111
- /F1.0 6 Tf
104
+ 308.1417 314.7359 Td
105
+ /F1.0 6.5 Tf
112
106
  [<554e>] TJ
113
107
  ET
114
108
 
115
- [0.3 0.6] 0.0 d
116
109
  0.3 w
117
110
  0.000 0.000 0.000 SCN
118
- 304.7244 311.8867 m
119
- 341.5748 311.8867 l
111
+ 335.9055 311.3287 m
112
+ 369.9213 311.3287 l
120
113
  S
121
114
  [] 0 d
122
115
  0.3 w
123
116
  0.000 0.000 0.000 SCN
124
117
 
125
118
  BT
126
- 330.0748 315.1857 Td
127
- /F1.0 6 Tf
119
+ 357.5463 314.7359 Td
120
+ /F1.0 6.5 Tf
128
121
  [<362c3030>] TJ
129
122
  ET
130
123
 
131
- [0.3 0.6] 0.0 d
132
124
  0.3 w
133
125
  0.000 0.000 0.000 SCN
134
- 341.5748 311.8867 m
135
- 384.0945 311.8867 l
126
+ 369.9213 311.3287 m
127
+ 403.937 311.3287 l
136
128
  S
137
129
  [] 0 d
138
130
  0.3 w
139
131
  0.000 0.000 0.000 SCN
140
132
 
141
133
  BT
142
- 366.5945 315.1857 Td
143
- /F1.0 6 Tf
134
+ 385.062 314.7359 Td
135
+ /F1.0 6.5 Tf
144
136
  [<312c31333132>] TJ
145
137
  ET
146
138
 
147
- [0.3 0.6] 0.0 d
148
139
  0.3 w
149
140
  0.000 0.000 0.000 SCN
150
- 384.0945 311.8867 m
151
- 426.6142 311.8867 l
141
+ 403.937 311.3287 m
142
+ 437.9528 311.3287 l
152
143
  S
153
144
  [] 0 d
154
145
  0.3 w
155
146
  0.000 0.000 0.000 SCN
156
147
 
157
148
  BT
158
- 415.1142 315.1857 Td
159
- /F1.0 6 Tf
149
+ 425.5778 314.7359 Td
150
+ /F1.0 6.5 Tf
160
151
  [<362c3739>] TJ
161
152
  ET
162
153
 
163
- [0.3 0.6] 0.0 d
164
154
  0.3 w
165
155
  0.000 0.000 0.000 SCN
166
- 426.6142 311.8867 m
167
- 469.1339 311.8867 l
156
+ 437.9528 311.3287 m
157
+ 471.9685 311.3287 l
168
158
  S
169
159
  [] 0 d
170
160
  0.3 w
171
161
  0.000 0.000 0.000 SCN
172
- [0.3 0.6] 0.0 d
173
162
  0.3 w
174
163
  0.000 0.000 0.000 SCN
175
- 469.1339 311.8867 m
176
- 497.4803 311.8867 l
164
+ 471.9685 311.3287 m
165
+ 500.315 311.3287 l
177
166
  S
178
167
  [] 0 d
179
168
  0.3 w
180
169
  0.000 0.000 0.000 SCN
181
- [0.3 0.6] 0.0 d
182
170
  0.3 w
183
171
  0.000 0.000 0.000 SCN
184
- 497.4803 311.8867 m
185
- 525.8268 311.8867 l
172
+ 500.315 311.3287 m
173
+ 528.6614 311.3287 l
186
174
  S
187
175
  [] 0 d
188
176
  0.3 w
189
177
  0.000 0.000 0.000 SCN
190
- [0.3 0.6] 0.0 d
191
178
  0.3 w
192
179
  0.000 0.000 0.000 SCN
193
- 525.8268 311.8867 m
194
- 551.3386 311.8867 l
180
+ 528.6614 311.3287 m
181
+ 554.1732 311.3287 l
195
182
  S
196
183
  [] 0 d
197
184
  0.3 w
198
185
  0.000 0.000 0.000 SCN
199
- [0.3 0.6] 0.0 d
200
186
  0.3 w
201
187
  0.000 0.000 0.000 SCN
202
- 551.3386 311.8867 m
203
- 575.7165 311.8867 l
188
+ 554.1732 311.3287 m
189
+ 575.7165 311.3287 l
204
190
  S
205
191
  [] 0 d
206
192
  0.3 w
@@ -234,13 +220,13 @@ xref
234
220
  0000000109 00000 n
235
221
  0000000158 00000 n
236
222
  0000000215 00000 n
237
- 0000002481 00000 n
238
- 0000002661 00000 n
223
+ 0000002271 00000 n
224
+ 0000002451 00000 n
239
225
  trailer
240
226
  << /Size 7
241
227
  /Root 2 0 R
242
228
  /Info 1 0 R
243
229
  >>
244
230
  startxref
245
- 2760
231
+ 2550
246
232
  %%EOF
data/spec/fixtures/nfe/lib/det_header#render.pdf CHANGED
@@ -17,7 +17,7 @@ endobj
17
17
  >>
18
18
  endobj
19
19
  4 0 obj
20
- << /Length 1620
20
+ << /Length 1593
21
21
  >>
22
22
  stream
23
23
  q
@@ -29,7 +29,7 @@ BT
29
29
  [<44> 35 <41444f5320444f205052> 30 <4f445554> 18 <4f202f20534552> 55 <5649c74f>] TJ
30
30
  ET
31
31
 
32
- 21.2598 148.5354 42.5197 181.4173 re
32
+ 21.2598 148.5354 45.3543 181.4173 re
33
33
  S
34
34
 
35
35
  BT
@@ -38,119 +38,119 @@ BT
38
38
  [<43d34449474f>] TJ
39
39
  ET
40
40
 
41
- 63.7795 148.5354 124.7244 181.4173 re
41
+ 66.6142 148.5354 172.9134 181.4173 re
42
42
  S
43
43
 
44
44
  BT
45
- 65.7795 323.8548 Td
45
+ 68.6142 323.8548 Td
46
46
  /F1.0 6 Tf
47
47
  [<444553435249c7c3> 55 <4f>] TJ
48
48
  ET
49
49
 
50
- 188.5039 148.5354 36.8504 181.4173 re
50
+ 239.5276 148.5354 29.7638 181.4173 re
51
51
  S
52
52
 
53
53
  BT
54
- 190.5039 323.8548 Td
54
+ 241.5276 323.8548 Td
55
55
  /F1.0 6 Tf
56
56
  [<4e434d>] TJ
57
57
  ET
58
58
 
59
- 225.3543 148.5354 22.6772 181.4173 re
59
+ 269.2913 148.5354 17.0079 181.4173 re
60
60
  S
61
61
 
62
62
  BT
63
- 227.3543 323.8548 Td
63
+ 271.2913 323.8548 Td
64
64
  /F1.0 6 Tf
65
65
  [<435354>] TJ
66
66
  ET
67
67
 
68
- 248.0315 148.5354 28.3465 181.4173 re
68
+ 286.2992 148.5354 19.8425 181.4173 re
69
69
  S
70
70
 
71
71
  BT
72
- 250.0315 323.8548 Td
72
+ 288.2992 323.8548 Td
73
73
  /F1.0 6 Tf
74
74
  [<43464f50>] TJ
75
75
  ET
76
76
 
77
- 276.378 148.5354 28.3465 181.4173 re
77
+ 306.1417 148.5354 29.7638 181.4173 re
78
78
  S
79
79
 
80
80
  BT
81
- 278.378 323.8548 Td
81
+ 308.1417 323.8548 Td
82
82
  /F1.0 6 Tf
83
83
  [<554e4944>] TJ
84
84
  ET
85
85
 
86
- 304.7244 148.5354 36.8504 181.4173 re
86
+ 335.9055 148.5354 34.0157 181.4173 re
87
87
  S
88
88
 
89
89
  BT
90
- 306.7244 323.8548 Td
90
+ 337.9055 323.8548 Td
91
91
  /F1.0 6 Tf
92
92
  [<51> 10 <55> 40 <414e54>] TJ
93
93
  ET
94
94
 
95
- 341.5748 148.5354 42.5197 181.4173 re
95
+ 369.9213 148.5354 34.0157 181.4173 re
96
96
  S
97
97
 
98
98
  BT
99
- 343.5748 323.8548 Td
99
+ 371.9213 323.8548 Td
100
100
  /F1.0 6 Tf
101
- [<56> 135 <414c4f5220554e4954>] TJ
101
+ [<564c20554e4954>] TJ
102
102
  ET
103
103
 
104
- 384.0945 148.5354 42.5197 181.4173 re
104
+ 403.937 148.5354 34.0157 181.4173 re
105
105
  S
106
106
 
107
107
  BT
108
- 386.0945 323.8548 Td
108
+ 405.937 323.8548 Td
109
109
  /F1.0 6 Tf
110
- [<56> 135 <414c4f522054> 18 <4f> 40 <54>] TJ
110
+ [<564c2054> 18 <4f> 40 <54> 93 <414c>] TJ
111
111
  ET
112
112
 
113
- 426.6142 148.5354 42.5197 181.4173 re
113
+ 437.9528 148.5354 34.0157 181.4173 re
114
114
  S
115
115
 
116
116
  BT
117
- 428.6142 323.8548 Td
117
+ 439.9528 323.8548 Td
118
118
  /F1.0 6 Tf
119
- [<42> 35 <4153452043c14c43>] TJ
119
+ [<42432049434d53>] TJ
120
120
  ET
121
121
 
122
- 469.1339 148.5354 28.3465 181.4173 re
122
+ 471.9685 148.5354 28.3465 181.4173 re
123
123
  S
124
124
 
125
125
  BT
126
- 471.1339 323.8548 Td
126
+ 473.9685 323.8548 Td
127
127
  /F1.0 6 Tf
128
128
  [<564c2049434d53>] TJ
129
129
  ET
130
130
 
131
- 497.4803 148.5354 28.3465 181.4173 re
131
+ 500.315 148.5354 28.3465 181.4173 re
132
132
  S
133
133
 
134
134
  BT
135
- 499.4803 323.8548 Td
135
+ 502.315 323.8548 Td
136
136
  /F1.0 6 Tf
137
137
  [<564c20495049>] TJ
138
138
  ET
139
139
 
140
- 525.8268 148.5354 25.5118 181.4173 re
140
+ 528.6614 148.5354 25.5118 181.4173 re
141
141
  S
142
142
 
143
143
  BT
144
- 527.8268 323.8548 Td
144
+ 530.6614 323.8548 Td
145
145
  /F1.0 6 Tf
146
146
  [<252049434d53>] TJ
147
147
  ET
148
148
 
149
- 551.3386 148.5354 24.378 181.4173 re
149
+ 554.1732 148.5354 21.5433 181.4173 re
150
150
  S
151
151
 
152
152
  BT
153
- 553.3386 323.8548 Td
153
+ 556.1732 323.8548 Td
154
154
  /F1.0 6 Tf
155
155
  [<2520495049>] TJ
156
156
  ET
@@ -194,14 +194,14 @@ xref
194
194
  0000000109 00000 n
195
195
  0000000158 00000 n
196
196
  0000000215 00000 n
197
- 0000001887 00000 n
198
- 0000002079 00000 n
199
- 0000002177 00000 n
197
+ 0000001860 00000 n
198
+ 0000002052 00000 n
199
+ 0000002150 00000 n
200
200
  trailer
201
201
  << /Size 8
202
202
  /Root 2 0 R
203
203
  /Info 1 0 R
204
204
  >>
205
205
  startxref
206
- 2276
206
+ 2249
207
207
  %%EOF