br_danfe 0.2.1 → 0.2.2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (57) hide show
  1. checksums.yaml +4 -4
  2. data/lib/br_danfe/danfe.rb +1 -1
  3. data/lib/br_danfe/danfe_lib/dest.rb +8 -8
  4. data/lib/br_danfe/danfe_lib/det_body.rb +3 -3
  5. data/lib/br_danfe/danfe_lib/det_header.rb +18 -18
  6. data/lib/br_danfe/danfe_lib/dup.rb +4 -4
  7. data/lib/br_danfe/danfe_lib/emit.rb +5 -5
  8. data/lib/br_danfe/danfe_lib/emit_header.rb +14 -14
  9. data/lib/br_danfe/danfe_lib/helper.rb +1 -1
  10. data/lib/br_danfe/danfe_lib/icmstot.rb +6 -6
  11. data/lib/br_danfe/danfe_lib/infadic.rb +9 -9
  12. data/lib/br_danfe/danfe_lib/issqn.rb +4 -4
  13. data/lib/br_danfe/danfe_lib/ticket.rb +4 -4
  14. data/lib/br_danfe/danfe_lib/transp.rb +6 -6
  15. data/lib/br_danfe/danfe_lib/vol.rb +3 -3
  16. data/lib/br_danfe/version.rb +1 -1
  17. data/spec/fixtures/nfe/lib/dest#render-v2.00.pdf +44 -44
  18. data/spec/fixtures/nfe/lib/dest#render-v3.10.pdf +44 -44
  19. data/spec/fixtures/nfe/lib/dest#render-with_cnpj.pdf +34 -34
  20. data/spec/fixtures/nfe/lib/dest#render-with_cpf.pdf +34 -34
  21. data/spec/fixtures/nfe/lib/dest#render-with_ie.pdf +35 -35
  22. data/spec/fixtures/nfe/lib/det_body#render-csosn.pdf +159 -159
  23. data/spec/fixtures/nfe/lib/det_body#render-cst.pdf +88 -88
  24. data/spec/fixtures/nfe/lib/det_body#render-fci.pdf +50 -43
  25. data/spec/fixtures/nfe/lib/det_body#render-icms_st.pdf +45 -45
  26. data/spec/fixtures/nfe/lib/det_header#render.pdf +36 -36
  27. data/spec/fixtures/nfe/lib/document#lcnpj-blank.pdf +6 -6
  28. data/spec/fixtures/nfe/lib/document#lcnpj-invalid.pdf +6 -6
  29. data/spec/fixtures/nfe/lib/document#lcnpj-valid.pdf +7 -7
  30. data/spec/fixtures/nfe/lib/document#lie-blank.pdf +6 -6
  31. data/spec/fixtures/nfe/lib/document#lie-invalid.pdf +6 -6
  32. data/spec/fixtures/nfe/lib/document#lie-valid.pdf +7 -7
  33. data/spec/fixtures/nfe/lib/dup#render.pdf +26 -26
  34. data/spec/fixtures/nfe/lib/emit#render.pdf +19 -19
  35. data/spec/fixtures/nfe/lib/emit_header#render-with_logo.pdf +485 -485
  36. data/spec/fixtures/nfe/lib/emit_header#render-without_logo.pdf +482 -482
  37. data/spec/fixtures/nfe/lib/icmstot#render.pdf +39 -39
  38. data/spec/fixtures/nfe/lib/infadic#render-extra_volume.pdf +38 -38
  39. data/spec/fixtures/nfe/lib/infadic#render.pdf +6 -6
  40. data/spec/fixtures/nfe/lib/issqn#render.pdf +18 -18
  41. data/spec/fixtures/nfe/lib/ticket#render.pdf +14 -14
  42. data/spec/fixtures/nfe/lib/transp#render-modfrete_0.pdf +27 -27
  43. data/spec/fixtures/nfe/lib/transp#render-modfrete_1.pdf +27 -27
  44. data/spec/fixtures/nfe/lib/transp#render-modfrete_2.pdf +27 -27
  45. data/spec/fixtures/nfe/lib/transp#render-modfrete_9.pdf +27 -27
  46. data/spec/fixtures/nfe/lib/transp#render.pdf +36 -36
  47. data/spec/fixtures/nfe/lib/vol#render-blank-boxes.pdf +16 -16
  48. data/spec/fixtures/nfe/lib/vol#render.pdf +21 -21
  49. data/spec/fixtures/nfe/v2.00/nfe_simples_nacional.xml.fixture.pdf +354 -354
  50. data/spec/fixtures/nfe/v2.00/nfe_with_extra_volumes.xml.fixture.pdf +1456 -1456
  51. data/spec/fixtures/nfe/v2.00/nfe_with_fci.xml.fixture.pdf +743 -736
  52. data/spec/fixtures/nfe/v2.00/nfe_with_ns.xml.fixture.pdf +1438 -1431
  53. data/spec/fixtures/nfe/v2.00/nfe_without_ns.xml.fixture.pdf +803 -803
  54. data/spec/fixtures/nfe/v3.10/nfe_simples_nacional.xml.fixture.pdf +531 -531
  55. data/spec/lib/danfe_lib/document_spec.rb +6 -6
  56. data/spec/lib/danfe_lib/transp_spec.rb +1 -1
  57. metadata +3 -3
data/spec/fixtures/nfe/lib/dest#render-v2.00.pdf CHANGED
@@ -17,206 +17,206 @@ endobj
17
17
  >>
18
18
  endobj
19
19
  4 0 obj
20
- << /Length 2848
20
+ << /Length 2745
21
21
  >>
22
22
  stream
23
23
  q
24
24
  0.3 w
25
25
 
26
26
  BT
27
- 7.086614173228347 608.772220472441 Td
27
+ 21.25984251968504 596.8667086614174 Td
28
28
  /F2.0 8 Tf
29
29
  [<44455354494e> 20 <41> 95 <54> 90 <c152494f202f2052454d4554454e5445>] TJ
30
30
  ET
31
31
 
32
- 7.087 583.654 349.228 22.677 re
32
+ 21.260 571.748 335.055 22.677 re
33
33
  S
34
34
 
35
35
  BT
36
- 9.086614173228348 600.2327086614175 Td
36
+ 23.25984251968504 588.3271968503939 Td
37
37
  /F1.0 6 Tf
38
38
  [<4e4f4d452f52415ac3> 55 <4f20534f4349414c>] TJ
39
39
  ET
40
40
 
41
41
 
42
42
  BT
43
- 9.086614173228348 586.5007086614174 Td
43
+ 23.25984251968504 574.5951968503938 Td
44
44
  /F1.0 10 Tf
45
45
  [<5363686e656964657220456c6563747269632042726173696c204c746461>] TJ
46
46
  ET
47
47
 
48
- 356.315 583.654 138.047 22.677 re
48
+ 356.315 571.748 138.047 22.677 re
49
49
  S
50
50
 
51
51
  BT
52
- 358.3149606299213 600.2327086614175 Td
52
+ 358.3149606299213 588.3271968503939 Td
53
53
  /F1.0 6 Tf
54
54
  [<434e504a2f435046>] TJ
55
55
  ET
56
56
 
57
57
 
58
58
  BT
59
- 358.3149606299213 586.5007086614174 Td
59
+ 358.3149606299213 574.5951968503938 Td
60
60
  /F1.0 10 Tf
61
61
  [<38322e3734332e3238372f303030382d3830>] TJ
62
62
  ET
63
63
 
64
- 7.087 560.976 288.000 22.677 re
64
+ 21.260 549.071 273.827 22.677 re
65
65
  S
66
66
 
67
67
  BT
68
- 9.086614173228348 577.5555433070867 Td
68
+ 23.25984251968504 565.6500314960631 Td
69
69
  /F1.0 6 Tf
70
70
  [<454e44455245c74f>] TJ
71
71
  ET
72
72
 
73
73
 
74
74
  BT
75
- 9.086614173228348 563.8235433070867 Td
75
+ 23.25984251968504 551.918031496063 Td
76
76
  /F1.0 10 Tf
77
77
  [<41> 74 <7620646120536175646164652031313235>] TJ
78
78
  ET
79
79
 
80
- 295.087 560.976 136.913 22.677 re
80
+ 295.087 549.071 136.913 22.677 re
81
81
  S
82
82
 
83
83
  BT
84
- 297.0866141732284 577.5555433070867 Td
84
+ 297.0866141732284 565.6500314960631 Td
85
85
  /F1.0 6 Tf
86
86
  [<42> 35 <41495252> 40 <4f>] TJ
87
87
  ET
88
88
 
89
89
 
90
90
  BT
91
- 297.0866141732284 563.8235433070867 Td
91
+ 297.0866141732284 551.918031496063 Td
92
92
  /F1.0 10 Tf
93
93
  [<46727574616c>] TJ
94
94
  ET
95
95
 
96
- 432.000 560.976 62.362 22.677 re
96
+ 432.000 549.071 62.362 22.677 re
97
97
  S
98
98
 
99
99
  BT
100
- 434.00000000000006 577.5555433070867 Td
100
+ 434.00000000000006 565.6500314960631 Td
101
101
  /F1.0 6 Tf
102
102
  [<434550>] TJ
103
103
  ET
104
104
 
105
105
 
106
106
  BT
107
- 434.00000000000006 563.8235433070867 Td
107
+ 434.00000000000006 551.918031496063 Td
108
108
  /F1.0 10 Tf
109
109
  [<31332e3137312d333230>] TJ
110
110
  ET
111
111
 
112
- 7.087 538.299 201.543 22.677 re
112
+ 21.260 526.394 187.370 22.677 re
113
113
  S
114
114
 
115
115
  BT
116
- 9.086614173228348 554.878377952756 Td
116
+ 23.25984251968504 542.9728661417323 Td
117
117
  /F1.0 6 Tf
118
118
  [<4d554e4943cd50494f>] TJ
119
119
  ET
120
120
 
121
121
 
122
122
  BT
123
- 9.086614173228348 541.146377952756 Td
123
+ 23.25984251968504 529.2408661417323 Td
124
124
  /F1.0 10 Tf
125
125
  [<53554d415245>] TJ
126
126
  ET
127
127
 
128
- 208.630 538.299 115.087 22.677 re
128
+ 208.630 526.394 115.087 22.677 re
129
129
  S
130
130
 
131
131
  BT
132
- 210.62992125984258 554.878377952756 Td
132
+ 210.62992125984258 542.9728661417323 Td
133
133
  /F1.0 6 Tf
134
134
  [<464f4e452f46> 74 <4158>] TJ
135
135
  ET
136
136
 
137
137
 
138
138
  BT
139
- 210.62992125984258 541.146377952756 Td
139
+ 210.62992125984258 529.2408661417323 Td
140
140
  /F1.0 10 Tf
141
141
  [<2831392920323130342d36333030>] TJ
142
142
  ET
143
143
 
144
- 323.717 538.299 32.315 22.677 re
144
+ 323.717 526.394 32.315 22.677 re
145
145
  S
146
146
 
147
147
  BT
148
- 325.71653543307093 554.878377952756 Td
148
+ 325.71653543307093 542.9728661417323 Td
149
149
  /F1.0 6 Tf
150
150
  [<5546>] TJ
151
151
  ET
152
152
 
153
153
 
154
154
  BT
155
- 325.71653543307093 541.146377952756 Td
155
+ 325.71653543307093 529.2408661417323 Td
156
156
  /F1.0 10 Tf
157
157
  [<5350>] TJ
158
158
  ET
159
159
 
160
- 356.031 538.299 138.331 22.677 re
160
+ 356.031 526.394 138.331 22.677 re
161
161
  S
162
162
 
163
163
  BT
164
- 358.0314960629922 554.878377952756 Td
164
+ 358.0314960629922 542.9728661417323 Td
165
165
  /F1.0 6 Tf
166
166
  [<494e53435249c7c3> 55 <4f20455354> 93 <414455> 40 <414c>] TJ
167
167
  ET
168
168
 
169
169
 
170
170
  BT
171
- 358.0314960629922 541.146377952756 Td
171
+ 358.0314960629922 529.2408661417323 Td
172
172
  /F1.0 10 Tf
173
173
  [<3637312e3030382e3337352e313130>] TJ
174
174
  ET
175
175
 
176
- 507.402 583.654 82.772 22.677 re
176
+ 507.402 571.748 68.598 22.677 re
177
177
  S
178
178
 
179
179
  BT
180
- 509.4015748031497 600.2327086614175 Td
180
+ 509.4015748031497 588.3271968503939 Td
181
181
  /F1.0 6 Tf
182
182
  [<44> 40 <41> 111 <54> 93 <412044> 40 <4120454d495353c3> 55 <4f>] TJ
183
183
  ET
184
184
 
185
185
 
186
186
  BT
187
- 542.6132283464567 586.5007086614174 Td
187
+ 528.44 574.5951968503938 Td
188
188
  /F1.0 10 Tf
189
189
  [<32392f31302f32303131>] TJ
190
190
  ET
191
191
 
192
- 507.402 560.976 82.772 22.677 re
192
+ 507.402 549.071 68.598 22.677 re
193
193
  S
194
194
 
195
195
  BT
196
- 509.4015748031497 577.5555433070867 Td
196
+ 509.4015748031497 565.6500314960631 Td
197
197
  /F1.0 6 Tf
198
- [<44> 40 <41> 111 <54> 93 <412044> 40 <4120454e54524144> 40 <412f5341cd44> 40 <41>] TJ
198
+ [<44> 40 <41> 111 <54> 93 <412044> 40 <41>] TJ
199
199
  ET
200
200
 
201
201
 
202
202
  BT
203
- 542.6132283464567 563.8235433070867 Td
203
+ 528.44 551.918031496063 Td
204
204
  /F1.0 10 Tf
205
205
  [<33302f31302f32303131>] TJ
206
206
  ET
207
207
 
208
- 507.402 538.299 82.772 22.677 re
208
+ 507.402 526.394 68.598 22.677 re
209
209
  S
210
210
 
211
211
  BT
212
- 509.4015748031497 554.878377952756 Td
212
+ 509.4015748031497 542.9728661417323 Td
213
213
  /F1.0 6 Tf
214
- [<484f524120444520454e54524144> 40 <412f5341cd44> 40 <41>] TJ
214
+ [<484f5241204445>] TJ
215
215
  ET
216
216
 
217
217
 
218
218
  BT
219
- 552.6132283464567 541.146377952756 Td
219
+ 538.44 529.2408661417323 Td
220
220
  /F1.0 10 Tf
221
221
  [<31353a33323a3435>] TJ
222
222
  ET
@@ -258,14 +258,14 @@ xref
258
258
  0000000109 00000 n
259
259
  0000000158 00000 n
260
260
  0000000215 00000 n
261
- 0000003115 00000 n
262
- 0000003307 00000 n
263
- 0000003405 00000 n
261
+ 0000003012 00000 n
262
+ 0000003204 00000 n
263
+ 0000003302 00000 n
264
264
  trailer
265
265
  << /Size 8
266
266
  /Root 2 0 R
267
267
  /Info 1 0 R
268
268
  >>
269
269
  startxref
270
- 3504
270
+ 3401
271
271
  %%EOF
data/spec/fixtures/nfe/lib/dest#render-v3.10.pdf CHANGED
@@ -17,206 +17,206 @@ endobj
17
17
  >>
18
18
  endobj
19
19
  4 0 obj
20
- << /Length 2848
20
+ << /Length 2745
21
21
  >>
22
22
  stream
23
23
  q
24
24
  0.3 w
25
25
 
26
26
  BT
27
- 7.086614173228347 608.772220472441 Td
27
+ 21.25984251968504 596.8667086614174 Td
28
28
  /F2.0 8 Tf
29
29
  [<44455354494e> 20 <41> 95 <54> 90 <c152494f202f2052454d4554454e5445>] TJ
30
30
  ET
31
31
 
32
- 7.087 583.654 349.228 22.677 re
32
+ 21.260 571.748 335.055 22.677 re
33
33
  S
34
34
 
35
35
  BT
36
- 9.086614173228348 600.2327086614175 Td
36
+ 23.25984251968504 588.3271968503939 Td
37
37
  /F1.0 6 Tf
38
38
  [<4e4f4d452f52415ac3> 55 <4f20534f4349414c>] TJ
39
39
  ET
40
40
 
41
41
 
42
42
  BT
43
- 9.086614173228348 586.5007086614174 Td
43
+ 23.25984251968504 574.5951968503938 Td
44
44
  /F1.0 10 Tf
45
45
  [<5363686e656964657220456c6563747269632042726173696c204c746461>] TJ
46
46
  ET
47
47
 
48
- 356.315 583.654 138.047 22.677 re
48
+ 356.315 571.748 138.047 22.677 re
49
49
  S
50
50
 
51
51
  BT
52
- 358.3149606299213 600.2327086614175 Td
52
+ 358.3149606299213 588.3271968503939 Td
53
53
  /F1.0 6 Tf
54
54
  [<434e504a2f435046>] TJ
55
55
  ET
56
56
 
57
57
 
58
58
  BT
59
- 358.3149606299213 586.5007086614174 Td
59
+ 358.3149606299213 574.5951968503938 Td
60
60
  /F1.0 10 Tf
61
61
  [<38322e3734332e3238372f303030382d3830>] TJ
62
62
  ET
63
63
 
64
- 7.087 560.976 288.000 22.677 re
64
+ 21.260 549.071 273.827 22.677 re
65
65
  S
66
66
 
67
67
  BT
68
- 9.086614173228348 577.5555433070867 Td
68
+ 23.25984251968504 565.6500314960631 Td
69
69
  /F1.0 6 Tf
70
70
  [<454e44455245c74f>] TJ
71
71
  ET
72
72
 
73
73
 
74
74
  BT
75
- 9.086614173228348 563.8235433070867 Td
75
+ 23.25984251968504 551.918031496063 Td
76
76
  /F1.0 10 Tf
77
77
  [<41> 74 <7620646120536175646164652031313235>] TJ
78
78
  ET
79
79
 
80
- 295.087 560.976 136.913 22.677 re
80
+ 295.087 549.071 136.913 22.677 re
81
81
  S
82
82
 
83
83
  BT
84
- 297.0866141732284 577.5555433070867 Td
84
+ 297.0866141732284 565.6500314960631 Td
85
85
  /F1.0 6 Tf
86
86
  [<42> 35 <41495252> 40 <4f>] TJ
87
87
  ET
88
88
 
89
89
 
90
90
  BT
91
- 297.0866141732284 563.8235433070867 Td
91
+ 297.0866141732284 551.918031496063 Td
92
92
  /F1.0 10 Tf
93
93
  [<46727574616c>] TJ
94
94
  ET
95
95
 
96
- 432.000 560.976 62.362 22.677 re
96
+ 432.000 549.071 62.362 22.677 re
97
97
  S
98
98
 
99
99
  BT
100
- 434.00000000000006 577.5555433070867 Td
100
+ 434.00000000000006 565.6500314960631 Td
101
101
  /F1.0 6 Tf
102
102
  [<434550>] TJ
103
103
  ET
104
104
 
105
105
 
106
106
  BT
107
- 434.00000000000006 563.8235433070867 Td
107
+ 434.00000000000006 551.918031496063 Td
108
108
  /F1.0 10 Tf
109
109
  [<31332e3137312d333230>] TJ
110
110
  ET
111
111
 
112
- 7.087 538.299 201.543 22.677 re
112
+ 21.260 526.394 187.370 22.677 re
113
113
  S
114
114
 
115
115
  BT
116
- 9.086614173228348 554.878377952756 Td
116
+ 23.25984251968504 542.9728661417323 Td
117
117
  /F1.0 6 Tf
118
118
  [<4d554e4943cd50494f>] TJ
119
119
  ET
120
120
 
121
121
 
122
122
  BT
123
- 9.086614173228348 541.146377952756 Td
123
+ 23.25984251968504 529.2408661417323 Td
124
124
  /F1.0 10 Tf
125
125
  [<53554d415245>] TJ
126
126
  ET
127
127
 
128
- 208.630 538.299 115.087 22.677 re
128
+ 208.630 526.394 115.087 22.677 re
129
129
  S
130
130
 
131
131
  BT
132
- 210.62992125984258 554.878377952756 Td
132
+ 210.62992125984258 542.9728661417323 Td
133
133
  /F1.0 6 Tf
134
134
  [<464f4e452f46> 74 <4158>] TJ
135
135
  ET
136
136
 
137
137
 
138
138
  BT
139
- 210.62992125984258 541.146377952756 Td
139
+ 210.62992125984258 529.2408661417323 Td
140
140
  /F1.0 10 Tf
141
141
  [<2831392920323130342d36333030>] TJ
142
142
  ET
143
143
 
144
- 323.717 538.299 32.315 22.677 re
144
+ 323.717 526.394 32.315 22.677 re
145
145
  S
146
146
 
147
147
  BT
148
- 325.71653543307093 554.878377952756 Td
148
+ 325.71653543307093 542.9728661417323 Td
149
149
  /F1.0 6 Tf
150
150
  [<5546>] TJ
151
151
  ET
152
152
 
153
153
 
154
154
  BT
155
- 325.71653543307093 541.146377952756 Td
155
+ 325.71653543307093 529.2408661417323 Td
156
156
  /F1.0 10 Tf
157
157
  [<5350>] TJ
158
158
  ET
159
159
 
160
- 356.031 538.299 138.331 22.677 re
160
+ 356.031 526.394 138.331 22.677 re
161
161
  S
162
162
 
163
163
  BT
164
- 358.0314960629922 554.878377952756 Td
164
+ 358.0314960629922 542.9728661417323 Td
165
165
  /F1.0 6 Tf
166
166
  [<494e53435249c7c3> 55 <4f20455354> 93 <414455> 40 <414c>] TJ
167
167
  ET
168
168
 
169
169
 
170
170
  BT
171
- 358.0314960629922 541.146377952756 Td
171
+ 358.0314960629922 529.2408661417323 Td
172
172
  /F1.0 10 Tf
173
173
  [<3637312e3030382e3337352e313130>] TJ
174
174
  ET
175
175
 
176
- 507.402 583.654 82.772 22.677 re
176
+ 507.402 571.748 68.598 22.677 re
177
177
  S
178
178
 
179
179
  BT
180
- 509.4015748031497 600.2327086614175 Td
180
+ 509.4015748031497 588.3271968503939 Td
181
181
  /F1.0 6 Tf
182
182
  [<44> 40 <41> 111 <54> 93 <412044> 40 <4120454d495353c3> 55 <4f>] TJ
183
183
  ET
184
184
 
185
185
 
186
186
  BT
187
- 542.6132283464567 586.5007086614174 Td
187
+ 528.44 574.5951968503938 Td
188
188
  /F1.0 10 Tf
189
189
  [<32392f31302f32303131>] TJ
190
190
  ET
191
191
 
192
- 507.402 560.976 82.772 22.677 re
192
+ 507.402 549.071 68.598 22.677 re
193
193
  S
194
194
 
195
195
  BT
196
- 509.4015748031497 577.5555433070867 Td
196
+ 509.4015748031497 565.6500314960631 Td
197
197
  /F1.0 6 Tf
198
- [<44> 40 <41> 111 <54> 93 <412044> 40 <4120454e54524144> 40 <412f5341cd44> 40 <41>] TJ
198
+ [<44> 40 <41> 111 <54> 93 <412044> 40 <41>] TJ
199
199
  ET
200
200
 
201
201
 
202
202
  BT
203
- 542.6132283464567 563.8235433070867 Td
203
+ 528.44 551.918031496063 Td
204
204
  /F1.0 10 Tf
205
205
  [<33302f31302f32303131>] TJ
206
206
  ET
207
207
 
208
- 507.402 538.299 82.772 22.677 re
208
+ 507.402 526.394 68.598 22.677 re
209
209
  S
210
210
 
211
211
  BT
212
- 509.4015748031497 554.878377952756 Td
212
+ 509.4015748031497 542.9728661417323 Td
213
213
  /F1.0 6 Tf
214
- [<484f524120444520454e54524144> 40 <412f5341cd44> 40 <41>] TJ
214
+ [<484f5241204445>] TJ
215
215
  ET
216
216
 
217
217
 
218
218
  BT
219
- 552.6132283464567 541.146377952756 Td
219
+ 538.44 529.2408661417323 Td
220
220
  /F1.0 10 Tf
221
221
  [<31333a33323a3435>] TJ
222
222
  ET
@@ -258,14 +258,14 @@ xref
258
258
  0000000109 00000 n
259
259
  0000000158 00000 n
260
260
  0000000215 00000 n
261
- 0000003115 00000 n
262
- 0000003307 00000 n
263
- 0000003405 00000 n
261
+ 0000003012 00000 n
262
+ 0000003204 00000 n
263
+ 0000003302 00000 n
264
264
  trailer
265
265
  << /Size 8
266
266
  /Root 2 0 R
267
267
  /Info 1 0 R
268
268
  >>
269
269
  startxref
270
- 3504
270
+ 3401
271
271
  %%EOF