RubyGems - br_danfe - Versions diffs - 0.6.1 → 0.7.0 - Mend

br_danfe 0.6.1 → 0.7.0

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 (53) hide show

checksums.yaml +4 -4
data/Gemfile.lock +25 -25
data/lib/br_danfe/danfe.rb +52 -25
data/lib/br_danfe/danfe_lib/det_body.rb +105 -46
data/lib/br_danfe/danfe_lib/document.rb +3 -7
data/lib/br_danfe/danfe_lib/emit_header.rb +36 -20
data/lib/br_danfe/danfe_lib/infadic.rb +12 -12
data/lib/br_danfe/danfe_lib/issqn.rb +19 -8
data/lib/br_danfe/version.rb +1 -1
data/spec/features/danfe_spec.rb +45 -0
data/spec/fixtures/nfe/lib/det_body#render-csosn.pdf +1932 -332
data/spec/fixtures/nfe/lib/det_body#render-cst.pdf +1182 -138
data/spec/fixtures/nfe/lib/det_body#render-fci.pdf +809 -43
data/spec/fixtures/nfe/lib/det_body#render-icms_st.pdf +809 -43
data/spec/fixtures/nfe/lib/det_body#render-quantity_with_custom_precision.pdf +807 -41
data/spec/fixtures/nfe/lib/det_body#render-three_pages.pdf +22414 -0
data/spec/fixtures/nfe/lib/det_body#render-two_pages.pdf +21442 -0
data/spec/fixtures/nfe/lib/det_body#render-unit_price_with_custom_precision.pdf +807 -41
data/spec/fixtures/nfe/lib/det_body#render-with_infadprod.pdf +1012 -0
data/spec/fixtures/nfe/lib/det_body#render-with_issqn.pdf +10124 -0
data/spec/fixtures/nfe/lib/det_body#render-without_issqn.pdf +10124 -0
data/spec/fixtures/nfe/lib/emit_header#render-second_page.pdf +792 -0
data/spec/fixtures/nfe/lib/emit_header#render-with_logo.pdf +88 -8
data/spec/fixtures/nfe/lib/emit_header#render-without_logo.pdf +85 -5
data/spec/fixtures/nfe/lib/infadic#render-footer_information.pdf +111 -0
data/spec/fixtures/nfe/lib/{issqn#render.pdf → issqn#render-with_issqn.pdf} +0 -0
data/spec/fixtures/nfe/lib/issqn#render-with_one_issqn_value.pdf +129 -0
data/spec/fixtures/nfe/lib/issqn#render-without_issqn.pdf +54 -0
data/spec/fixtures/nfe/v2.00/custom_options.fixture.pdf +2190 -1067
data/spec/fixtures/nfe/v2.00/nfe_simples_nacional.xml.fixture.pdf +2183 -1059
data/spec/fixtures/nfe/v2.00/nfe_with_extra_volumes.xml.fixture.pdf +8803 -3208
data/spec/fixtures/nfe/v2.00/nfe_with_fci.xml.fixture.pdf +1825 -1258
data/spec/fixtures/nfe/v2.00/nfe_with_ns.xml.fixture.pdf +8609 -3014
data/spec/fixtures/nfe/v2.00/nfe_without_ns.xml.fixture.pdf +2664 -1541
data/spec/fixtures/nfe/v3.10/nfe_simples_nacional.xml.fixture.pdf +4701 -1909
data/spec/fixtures/nfe/v3.10/with_footer.fixture.pdf +8660 -0
data/spec/fixtures/nfe/v3.10/with_footer.xml +621 -0
data/spec/fixtures/nfe/v3.10/with_issqn.fixture.pdf +8646 -0
data/spec/fixtures/nfe/v3.10/with_issqn.xml +621 -0
data/spec/fixtures/nfe/v3.10/with_three_pages.fixture.pdf +25420 -0
data/spec/fixtures/nfe/v3.10/with_three_pages.xml +1281 -0
data/spec/fixtures/nfe/v3.10/withot_issqn.fixture.pdf +10338 -0
data/spec/fixtures/nfe/v3.10/withot_issqn.xml +688 -0
data/spec/lib/danfe_lib/det_body_spec.rb +350 -264
data/spec/lib/danfe_lib/emit_header_spec.rb +42 -18
data/spec/lib/danfe_lib/issqn_spec.rb +39 -7
metadata +38 -14
data/lib/br_danfe/danfe_lib/det_header.rb +0 -40
data/lib/br_danfe/danfe_lib/emit.rb +0 -23
data/spec/fixtures/nfe/lib/det_header#render.pdf +0 -207
data/spec/fixtures/nfe/lib/emit#render.pdf +0 -143
data/spec/lib/danfe_lib/det_header_spec.rb +0 -26
data/spec/lib/danfe_lib/emit_spec.rb +0 -60

data/spec/fixtures/nfe/lib/det_body#render-unit_price_with_custom_precision.pdf CHANGED Viewed

@@ -17,176 +17,942 @@ endobj
 >>
 endobj
 4 0 obj
-<< /Length 2004
+<< /Length 11405
 >>
 stream
 q
 0.3 w
-0.3 w
+1 w
 /DeviceRGB CS
 0.000 0.000 0.000 SCN
-21.2598 311.3287 m
-66.6142 311.3287 l
+21.2598 329.6693 m
+575.7165 329.6693 l
+S
+[] 0 d
+1 w
+0.000 0.000 0.000 SCN
+21.2598 318.9733 m
+575.7165 318.9733 l
+S
+[] 0 d
+1 w
+0.000 0.000 0.000 SCN
+21.2598 330.1693 m
+21.2598 318.4733 l
+S
+[] 0 d
+1 w
+0.000 0.000 0.000 SCN
+575.7165 330.1693 m
+575.7165 318.4733 l
+S
+[] 0 d
+0.3 w
+0.000 0.000 0.000 SCN
+0.3 w
+0.000 0.000 0.000 SCN
+21.2598 329.6693 m
+66.6142 329.6693 l
+S
+[] 0 d
+0.3 w
+0.000 0.000 0.000 SCN
+21.2598 318.9733 m
+66.6142 318.9733 l
+S
+[] 0 d
+0.3 w
+0.000 0.000 0.000 SCN
+21.2598 329.8193 m
+21.2598 318.8233 l
+S
+[] 0 d
+0.3 w
+0.000 0.000 0.000 SCN
+66.6142 329.8193 m
+66.6142 318.8233 l
+S
+[] 0 d
+0.3 w
+0.000 0.000 0.000 SCN
+BT
+23.2598 320.9733 Td
+/F1.0 6 Tf
+[<43d34449474f>] TJ
+ET
+0.3 w
+0.000 0.000 0.000 SCN
+66.6142 329.6693 m
+239.5276 329.6693 l
+S
+[] 0 d
+0.3 w
+0.000 0.000 0.000 SCN
+66.6142 318.9733 m
+239.5276 318.9733 l
+S
+[] 0 d
+0.3 w
+0.000 0.000 0.000 SCN
+66.6142 329.8193 m
+66.6142 318.8233 l
+S
+[] 0 d
+0.3 w
+0.000 0.000 0.000 SCN
+239.5276 329.8193 m
+239.5276 318.8233 l
+S
+[] 0 d
+0.3 w
+0.000 0.000 0.000 SCN
+BT
+68.6142 320.9733 Td
+/F1.0 6 Tf
+[<444553435249c7c3> 55 <4f>] TJ
+ET
+0.3 w
+0.000 0.000 0.000 SCN
+239.5276 329.6693 m
+269.2913 329.6693 l
+S
+[] 0 d
+0.3 w
+0.000 0.000 0.000 SCN
+239.5276 318.9733 m
+269.2913 318.9733 l
+S
+[] 0 d
+0.3 w
+0.000 0.000 0.000 SCN
+239.5276 329.8193 m
+239.5276 318.8233 l
+S
+[] 0 d
+0.3 w
+0.000 0.000 0.000 SCN
+269.2913 329.8193 m
+269.2913 318.8233 l
+S
+[] 0 d
+0.3 w
+0.000 0.000 0.000 SCN
+BT
+241.5276 320.9733 Td
+/F1.0 6 Tf
+[<4e434d>] TJ
+ET
+0.3 w
+0.000 0.000 0.000 SCN
+269.2913 329.6693 m
+286.2992 329.6693 l
+S
+[] 0 d
+0.3 w
+0.000 0.000 0.000 SCN
+269.2913 318.9733 m
+286.2992 318.9733 l
+S
+[] 0 d
+0.3 w
+0.000 0.000 0.000 SCN
+269.2913 329.8193 m
+269.2913 318.8233 l
+S
+[] 0 d
+0.3 w
+0.000 0.000 0.000 SCN
+286.2992 329.8193 m
+286.2992 318.8233 l
+S
+[] 0 d
+0.3 w
+0.000 0.000 0.000 SCN
+BT
+271.2913 320.9733 Td
+/F1.0 6 Tf
+[<435354>] TJ
+ET
+0.3 w
+0.000 0.000 0.000 SCN
+286.2992 329.6693 m
+306.1417 329.6693 l
+S
+[] 0 d
+0.3 w
+0.000 0.000 0.000 SCN
+286.2992 318.9733 m
+306.1417 318.9733 l
+S
+[] 0 d
+0.3 w
+0.000 0.000 0.000 SCN
+286.2992 329.8193 m
+286.2992 318.8233 l
+S
+[] 0 d
+0.3 w
+0.000 0.000 0.000 SCN
+306.1417 329.8193 m
+306.1417 318.8233 l
+S
+[] 0 d
+0.3 w
+0.000 0.000 0.000 SCN
+BT
+288.2992 320.9733 Td
+/F1.0 6 Tf
+[<43464f50>] TJ
+ET
+0.3 w
+0.000 0.000 0.000 SCN
+306.1417 329.6693 m
+335.9055 329.6693 l
+S
+[] 0 d
+0.3 w
+0.000 0.000 0.000 SCN
+306.1417 318.9733 m
+335.9055 318.9733 l
+S
+[] 0 d
+0.3 w
+0.000 0.000 0.000 SCN
+306.1417 329.8193 m
+306.1417 318.8233 l
+S
+[] 0 d
+0.3 w
+0.000 0.000 0.000 SCN
+335.9055 329.8193 m
+335.9055 318.8233 l
+S
+[] 0 d
+0.3 w
+0.000 0.000 0.000 SCN
+BT
+308.1417 320.9733 Td
+/F1.0 6 Tf
+[<554e4944>] TJ
+ET
+0.3 w
+0.000 0.000 0.000 SCN
+335.9055 329.6693 m
+369.9213 329.6693 l
+S
+[] 0 d
+0.3 w
+0.000 0.000 0.000 SCN
+335.9055 318.9733 m
+369.9213 318.9733 l
+S
+[] 0 d
+0.3 w
+0.000 0.000 0.000 SCN
+335.9055 329.8193 m
+335.9055 318.8233 l
+S
+[] 0 d
+0.3 w
+0.000 0.000 0.000 SCN
+369.9213 329.8193 m
+369.9213 318.8233 l
+S
+[] 0 d
+0.3 w
+0.000 0.000 0.000 SCN
+BT
+337.9055 320.9733 Td
+/F1.0 6 Tf
+[<51> 10 <55> 40 <414e54>] TJ
+ET
+0.3 w
+0.000 0.000 0.000 SCN
+369.9213 329.6693 m
+403.937 329.6693 l
+S
+[] 0 d
+0.3 w
+0.000 0.000 0.000 SCN
+369.9213 318.9733 m
+403.937 318.9733 l
+S
+[] 0 d
+0.3 w
+0.000 0.000 0.000 SCN
+369.9213 329.8193 m
+369.9213 318.8233 l
+S
+[] 0 d
+0.3 w
+0.000 0.000 0.000 SCN
+403.937 329.8193 m
+403.937 318.8233 l
+S
+[] 0 d
+0.3 w
+0.000 0.000 0.000 SCN
+BT
+371.9213 320.9733 Td
+/F1.0 6 Tf
+[<564c20554e4954>] TJ
+ET
+0.3 w
+0.000 0.000 0.000 SCN
+403.937 329.6693 m
+437.9528 329.6693 l
+S
+[] 0 d
+0.3 w
+0.000 0.000 0.000 SCN
+403.937 318.9733 m
+437.9528 318.9733 l
+S
+[] 0 d
+0.3 w
+0.000 0.000 0.000 SCN
+403.937 329.8193 m
+403.937 318.8233 l
+S
+[] 0 d
+0.3 w
+0.000 0.000 0.000 SCN
+437.9528 329.8193 m
+437.9528 318.8233 l
+S
+[] 0 d
+0.3 w
+0.000 0.000 0.000 SCN
+BT
+405.937 320.9733 Td
+/F1.0 6 Tf
+[<564c2054> 18 <4f> 40 <54> 93 <414c>] TJ
+ET
+0.3 w
+0.000 0.000 0.000 SCN
+437.9528 329.6693 m
+471.9685 329.6693 l
+S
+[] 0 d
+0.3 w
+0.000 0.000 0.000 SCN
+437.9528 318.9733 m
+471.9685 318.9733 l
+S
+[] 0 d
+0.3 w
+0.000 0.000 0.000 SCN
+437.9528 329.8193 m
+437.9528 318.8233 l
+S
+[] 0 d
+0.3 w
+0.000 0.000 0.000 SCN
+471.9685 329.8193 m
+471.9685 318.8233 l
+S
+[] 0 d
+0.3 w
+0.000 0.000 0.000 SCN
+BT
+439.9528 320.9733 Td
+/F1.0 6 Tf
+[<42432049434d53>] TJ
+ET
+0.3 w
+0.000 0.000 0.000 SCN
+471.9685 329.6693 m
+500.315 329.6693 l
+S
+[] 0 d
+0.3 w
+0.000 0.000 0.000 SCN
+471.9685 318.9733 m
+500.315 318.9733 l
+S
+[] 0 d
+0.3 w
+0.000 0.000 0.000 SCN
+471.9685 329.8193 m
+471.9685 318.8233 l
+S
+[] 0 d
+0.3 w
+0.000 0.000 0.000 SCN
+500.315 329.8193 m
+500.315 318.8233 l
+S
+[] 0 d
+0.3 w
+0.000 0.000 0.000 SCN
+BT
+473.9685 320.9733 Td
+/F1.0 6 Tf
+[<564c2049434d53>] TJ
+ET
+0.3 w
+0.000 0.000 0.000 SCN
+500.315 329.6693 m
+528.6614 329.6693 l
+S
+[] 0 d
+0.3 w
+0.000 0.000 0.000 SCN
+500.315 318.9733 m
+528.6614 318.9733 l
+S
+[] 0 d
+0.3 w
+0.000 0.000 0.000 SCN
+500.315 329.8193 m
+500.315 318.8233 l
+S
+[] 0 d
+0.3 w
+0.000 0.000 0.000 SCN
+528.6614 329.8193 m
+528.6614 318.8233 l
+S
+[] 0 d
+0.3 w
+0.000 0.000 0.000 SCN
+BT
+502.315 320.9733 Td
+/F1.0 6 Tf
+[<564c20495049>] TJ
+ET
+0.3 w
+0.000 0.000 0.000 SCN
+528.6614 329.6693 m
+554.1732 329.6693 l
+S
+[] 0 d
+0.3 w
+0.000 0.000 0.000 SCN
+528.6614 318.9733 m
+554.1732 318.9733 l
+S
+[] 0 d
+0.3 w
+0.000 0.000 0.000 SCN
+528.6614 329.8193 m
+528.6614 318.8233 l
+S
+[] 0 d
+0.3 w
+0.000 0.000 0.000 SCN
+554.1732 329.8193 m
+554.1732 318.8233 l
+S
+[] 0 d
+0.3 w
+0.000 0.000 0.000 SCN
+BT
+530.6614 320.9733 Td
+/F1.0 6 Tf
+[<252049434d53>] TJ
+ET
+0.3 w
+0.000 0.000 0.000 SCN
+554.1732 329.6693 m
+575.7165 329.6693 l
+S
+[] 0 d
+0.3 w
+0.000 0.000 0.000 SCN
+554.1732 318.9733 m
+575.7165 318.9733 l
+S
+[] 0 d
+0.3 w
+0.000 0.000 0.000 SCN
+554.1732 329.8193 m
+554.1732 318.8233 l
+S
+[] 0 d
+0.3 w
+0.000 0.000 0.000 SCN
+575.7165 329.8193 m
+575.7165 318.8233 l
 S
 [] 0 d
 0.3 w
 0.000 0.000 0.000 SCN
 BT
-23.2598 314.7359 Td
+556.1732 320.9733 Td
+/F1.0 6 Tf
+[<2520495049>] TJ
+ET
+1 w
+0.000 0.000 0.000 SCN
+21.2598 318.9733 m
+575.7165 318.9733 l
+S
+[] 0 d
+1 w
+0.000 0.000 0.000 SCN
+21.2598 307.7193 m
+575.7165 307.7193 l
+S
+[] 0 d
+1 w
+0.000 0.000 0.000 SCN
+21.2598 319.4733 m
+21.2598 307.2193 l
+S
+[] 0 d
+1 w
+0.000 0.000 0.000 SCN
+575.7165 319.4733 m
+575.7165 307.2193 l
+S
+[] 0 d
+0.3 w
+0.000 0.000 0.000 SCN
+0.3 w
+0.000 0.000 0.000 SCN
+21.2598 318.9733 m
+66.6142 318.9733 l
+S
+[] 0 d
+0.3 w
+0.000 0.000 0.000 SCN
+21.2598 307.7193 m
+66.6142 307.7193 l
+S
+[] 0 d
+0.3 w
+0.000 0.000 0.000 SCN
+21.2598 319.1233 m
+21.2598 307.5693 l
+S
+[] 0 d
+0.3 w
+0.000 0.000 0.000 SCN
+66.6142 319.1233 m
+66.6142 307.5693 l
+S
+[] 0 d
+0.3 w
+0.000 0.000 0.000 SCN
+BT
+23.2598 309.9358 Td
 /F1.0 6.5 Tf
 [<33>] TJ
 ET
 0.3 w
 0.000 0.000 0.000 SCN
-66.6142 311.3287 m
-239.5276 311.3287 l
+66.6142 318.9733 m
+239.5276 318.9733 l
+S
+[] 0 d
+0.3 w
+0.000 0.000 0.000 SCN
+66.6142 307.7193 m
+239.5276 307.7193 l
+S
+[] 0 d
+0.3 w
+0.000 0.000 0.000 SCN
+66.6142 319.1233 m
+66.6142 307.5693 l
+S
+[] 0 d
+0.3 w
+0.000 0.000 0.000 SCN
+239.5276 319.1233 m
+239.5276 307.5693 l
 S
 [] 0 d
 0.3 w
 0.000 0.000 0.000 SCN
 BT
-68.6142 314.7359 Td
+68.6142 309.9358 Td
 /F1.0 6.5 Tf
 [<50726f6475746f20436f6d2043736f736e20323031202d2049434d53205354>] TJ
 ET
 0.3 w
 0.000 0.000 0.000 SCN
-239.5276 311.3287 m
-269.2913 311.3287 l
+239.5276 318.9733 m
+269.2913 318.9733 l
+S
+[] 0 d
+0.3 w
+0.000 0.000 0.000 SCN
+239.5276 307.7193 m
+269.2913 307.7193 l
+S
+[] 0 d
+0.3 w
+0.000 0.000 0.000 SCN
+239.5276 319.1233 m
+239.5276 307.5693 l
+S
+[] 0 d
+0.3 w
+0.000 0.000 0.000 SCN
+269.2913 319.1233 m
+269.2913 307.5693 l
 S
 [] 0 d
 0.3 w
 0.000 0.000 0.000 SCN
 BT
-241.5276 314.7359 Td
+241.5276 309.9358 Td
 /F1.0 6.5 Tf
 [<3435363738393031>] TJ
 ET
 0.3 w
 0.000 0.000 0.000 SCN
-269.2913 311.3287 m
-286.2992 311.3287 l
+269.2913 318.9733 m
+286.2992 318.9733 l
 S
 [] 0 d
 0.3 w
 0.000 0.000 0.000 SCN
+269.2913 307.7193 m
+286.2992 307.7193 l
+S
+[] 0 d
+0.3 w
+0.000 0.000 0.000 SCN
+269.2913 319.1233 m
+269.2913 307.5693 l
+S
+[] 0 d
 0.3 w
 0.000 0.000 0.000 SCN
-286.2992 311.3287 m
-306.1417 311.3287 l
+286.2992 319.1233 m
+286.2992 307.5693 l
+S
+[] 0 d
+0.3 w
+0.000 0.000 0.000 SCN
+0.3 w
+0.000 0.000 0.000 SCN
+286.2992 318.9733 m
+306.1417 318.9733 l
+S
+[] 0 d
+0.3 w
+0.000 0.000 0.000 SCN
+286.2992 307.7193 m
+306.1417 307.7193 l
+S
+[] 0 d
+0.3 w
+0.000 0.000 0.000 SCN
+286.2992 319.1233 m
+286.2992 307.5693 l
+S
+[] 0 d
+0.3 w
+0.000 0.000 0.000 SCN
+306.1417 319.1233 m
+306.1417 307.5693 l
 S
 [] 0 d
 0.3 w
 0.000 0.000 0.000 SCN
 BT
-288.2992 314.7359 Td
+288.2992 309.9358 Td
 /F1.0 6.5 Tf
 [<35343031>] TJ
 ET
 0.3 w
 0.000 0.000 0.000 SCN
-306.1417 311.3287 m
-335.9055 311.3287 l
+306.1417 318.9733 m
+335.9055 318.9733 l
+S
+[] 0 d
+0.3 w
+0.000 0.000 0.000 SCN
+306.1417 307.7193 m
+335.9055 307.7193 l
+S
+[] 0 d
+0.3 w
+0.000 0.000 0.000 SCN
+306.1417 319.1233 m
+306.1417 307.5693 l
+S
+[] 0 d
+0.3 w
+0.000 0.000 0.000 SCN
+335.9055 319.1233 m
+335.9055 307.5693 l
 S
 [] 0 d
 0.3 w
 0.000 0.000 0.000 SCN
 BT
-308.1417 314.7359 Td
+308.1417 309.9358 Td
 /F1.0 6.5 Tf
 [<554e>] TJ
 ET
 0.3 w
 0.000 0.000 0.000 SCN
-335.9055 311.3287 m
-369.9213 311.3287 l
+335.9055 318.9733 m
+369.9213 318.9733 l
+S
+[] 0 d
+0.3 w
+0.000 0.000 0.000 SCN
+335.9055 307.7193 m
+369.9213 307.7193 l
+S
+[] 0 d
+0.3 w
+0.000 0.000 0.000 SCN
+335.9055 319.1233 m
+335.9055 307.5693 l
+S
+[] 0 d
+0.3 w
+0.000 0.000 0.000 SCN
+369.9213 319.1233 m
+369.9213 307.5693 l
 S
 [] 0 d
 0.3 w
 0.000 0.000 0.000 SCN
 BT
-357.5463 314.7359 Td
+357.5463 309.9358 Td
 /F1.0 6.5 Tf
 [<362c3030>] TJ
 ET
 0.3 w
 0.000 0.000 0.000 SCN
-369.9213 311.3287 m
-403.937 311.3287 l
+369.9213 318.9733 m
+403.937 318.9733 l
+S
+[] 0 d
+0.3 w
+0.000 0.000 0.000 SCN
+369.9213 307.7193 m
+403.937 307.7193 l
+S
+[] 0 d
+0.3 w
+0.000 0.000 0.000 SCN
+369.9213 319.1233 m
+369.9213 307.5693 l
+S
+[] 0 d
+0.3 w
+0.000 0.000 0.000 SCN
+403.937 319.1233 m
+403.937 307.5693 l
 S
 [] 0 d
 0.3 w
 0.000 0.000 0.000 SCN
 BT
-385.062 314.7359 Td
+385.062 309.9358 Td
 /F1.0 6.5 Tf
 [<312c31333132>] TJ
 ET
 0.3 w
 0.000 0.000 0.000 SCN
-403.937 311.3287 m
-437.9528 311.3287 l
+403.937 318.9733 m
+437.9528 318.9733 l
+S
+[] 0 d
+0.3 w
+0.000 0.000 0.000 SCN
+403.937 307.7193 m
+437.9528 307.7193 l
+S
+[] 0 d
+0.3 w
+0.000 0.000 0.000 SCN
+403.937 319.1233 m
+403.937 307.5693 l
+S
+[] 0 d
+0.3 w
+0.000 0.000 0.000 SCN
+437.9528 319.1233 m
+437.9528 307.5693 l
 S
 [] 0 d
 0.3 w
 0.000 0.000 0.000 SCN
 BT
-425.5778 314.7359 Td
+425.5778 309.9358 Td
 /F1.0 6.5 Tf
 [<362c3739>] TJ
 ET
 0.3 w
 0.000 0.000 0.000 SCN
-437.9528 311.3287 m
-471.9685 311.3287 l
+437.9528 318.9733 m
+471.9685 318.9733 l
+S
+[] 0 d
+0.3 w
+0.000 0.000 0.000 SCN
+437.9528 307.7193 m
+471.9685 307.7193 l
+S
+[] 0 d
+0.3 w
+0.000 0.000 0.000 SCN
+437.9528 319.1233 m
+437.9528 307.5693 l
+S
+[] 0 d
+0.3 w
+0.000 0.000 0.000 SCN
+471.9685 319.1233 m
+471.9685 307.5693 l
+S
+[] 0 d
+0.3 w
+0.000 0.000 0.000 SCN
+0.3 w
+0.000 0.000 0.000 SCN
+471.9685 318.9733 m
+500.315 318.9733 l
+S
+[] 0 d
+0.3 w
+0.000 0.000 0.000 SCN
+471.9685 307.7193 m
+500.315 307.7193 l
 S
 [] 0 d
 0.3 w
 0.000 0.000 0.000 SCN
+471.9685 319.1233 m
+471.9685 307.5693 l
+S
+[] 0 d
 0.3 w
 0.000 0.000 0.000 SCN
-471.9685 311.3287 m
-500.315 311.3287 l
+500.315 319.1233 m
+500.315 307.5693 l
 S
 [] 0 d
 0.3 w
 0.000 0.000 0.000 SCN
 0.3 w
 0.000 0.000 0.000 SCN
-500.315 311.3287 m
-528.6614 311.3287 l
+500.315 318.9733 m
+528.6614 318.9733 l
 S
 [] 0 d
 0.3 w
 0.000 0.000 0.000 SCN
+500.315 307.7193 m
+528.6614 307.7193 l
+S
+[] 0 d
 0.3 w
 0.000 0.000 0.000 SCN
-528.6614 311.3287 m
-554.1732 311.3287 l
+500.315 319.1233 m
+500.315 307.5693 l
 S
 [] 0 d
 0.3 w
 0.000 0.000 0.000 SCN
+528.6614 319.1233 m
+528.6614 307.5693 l
+S
+[] 0 d
+0.3 w
+0.000 0.000 0.000 SCN
+0.3 w
+0.000 0.000 0.000 SCN
+528.6614 318.9733 m
+554.1732 318.9733 l
+S
+[] 0 d
+0.3 w
+0.000 0.000 0.000 SCN
+528.6614 307.7193 m
+554.1732 307.7193 l
+S
+[] 0 d
+0.3 w
+0.000 0.000 0.000 SCN
+528.6614 319.1233 m
+528.6614 307.5693 l
+S
+[] 0 d
+0.3 w
+0.000 0.000 0.000 SCN
+554.1732 319.1233 m
+554.1732 307.5693 l
+S
+[] 0 d
+0.3 w
+0.000 0.000 0.000 SCN
+0.3 w
+0.000 0.000 0.000 SCN
+554.1732 318.9733 m
+575.7165 318.9733 l
+S
+[] 0 d
+0.3 w
+0.000 0.000 0.000 SCN
+554.1732 307.7193 m
+575.7165 307.7193 l
+S
+[] 0 d
+0.3 w
+0.000 0.000 0.000 SCN
+554.1732 319.1233 m
+554.1732 307.5693 l
+S
+[] 0 d
 0.3 w
 0.000 0.000 0.000 SCN
-554.1732 311.3287 m
-575.7165 311.3287 l
+575.7165 319.1233 m
+575.7165 307.5693 l
 S
 [] 0 d
 0.3 w
@@ -220,13 +986,13 @@ xref
 0000000109 00000 n
 0000000158 00000 n
 0000000215 00000 n
-0000002271 00000 n
-0000002451 00000 n
+0000011673 00000 n
+0000011853 00000 n
 trailer
 << /Size 7
 /Root 2 0 R
 /Info 1 0 R
 >>
 startxref
-2550
+11952
 %%EOF