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

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

checksums.yaml +4 -4
data/Gemfile.lock +10 -10
data/config/locales/pt-BR.yml +3 -3
data/lib/br_danfe/danfe_lib/det_body.rb +14 -13
data/lib/br_danfe/danfe_lib/det_header.rb +14 -14
data/lib/br_danfe/version.rb +1 -1
data/spec/fixtures/nfe/lib/det_body#render-csosn.pdf +197 -260
data/spec/fixtures/nfe/lib/det_body#render-cst.pdf +116 -144
data/spec/fixtures/nfe/lib/det_body#render-fci.pdf +53 -74
data/spec/fixtures/nfe/lib/det_body#render-icms_st.pdf +53 -74
data/spec/fixtures/nfe/lib/det_body#render-quantity_with_custom_precision.pdf +48 -62
data/spec/fixtures/nfe/lib/det_body#render-unit_price_with_custom_precision.pdf +48 -62
data/spec/fixtures/nfe/lib/det_header#render.pdf +35 -35
data/spec/fixtures/nfe/v2.00/custom_options.fixture.pdf +179 -221
data/spec/fixtures/nfe/v2.00/nfe_simples_nacional.xml.fixture.pdf +177 -219
data/spec/fixtures/nfe/v2.00/nfe_with_extra_volumes.xml.fixture.pdf +882 -1092
data/spec/fixtures/nfe/v2.00/nfe_with_fci.xml.fixture.pdf +107 -128
data/spec/fixtures/nfe/v2.00/nfe_with_ns.xml.fixture.pdf +882 -1092
data/spec/fixtures/nfe/v2.00/nfe_without_ns.xml.fixture.pdf +206 -248
data/spec/fixtures/nfe/v3.10/nfe_simples_nacional.xml.fixture.pdf +453 -593
metadata +2 -2

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

@@ -17,799 +17,736 @@ endobj
 >>
 endobj
 4 0 obj
-<< /Length 9367
+<< /Length 8496
 >>
 stream
 q
 0.3 w
-[0.3 0.6] 0.0 d
 0.3 w
 /DeviceRGB CS
 0.000 0.000 0.000 SCN
-21.2598 311.8867 m
-63.7795 311.8867 l
+21.2598 311.3287 m
+66.6142 311.3287 l
 S
 [] 0 d
 0.3 w
 0.000 0.000 0.000 SCN
 BT
-23.2598 315.1857 Td
-/F1.0 6 Tf
+23.2598 314.7359 Td
+/F1.0 6.5 Tf
 [<31>] TJ
 ET
-[0.3 0.6] 0.0 d
 0.3 w
 0.000 0.000 0.000 SCN
-63.7795 311.8867 m
-188.5039 311.8867 l
+66.6142 311.3287 m
+239.5276 311.3287 l
 S
 [] 0 d
 0.3 w
 0.000 0.000 0.000 SCN
 BT
-65.7795 315.1857 Td
-/F1.0 6 Tf
+68.6142 314.7359 Td
+/F1.0 6.5 Tf
 [<50726f6475746f20636f6d2043534f534e20313031202d204e6163696f6e616c>] TJ
 ET
-[0.3 0.6] 0.0 d
 0.3 w
 0.000 0.000 0.000 SCN
-188.5039 311.8867 m
-225.3543 311.8867 l
+239.5276 311.3287 m
+269.2913 311.3287 l
 S
 [] 0 d
 0.3 w
 0.000 0.000 0.000 SCN
 BT
-190.5039 315.1857 Td
-/F1.0 6 Tf
+241.5276 314.7359 Td
+/F1.0 6.5 Tf
 [<3132333435363738>] TJ
 ET
-[0.3 0.6] 0.0 d
 0.3 w
 0.000 0.000 0.000 SCN
-225.3543 311.8867 m
-248.0315 311.8867 l
+269.2913 311.3287 m
+286.2992 311.3287 l
 S
 [] 0 d
 0.3 w
 0.000 0.000 0.000 SCN
 BT
-227.3543 315.1857 Td
-/F1.0 6 Tf
+271.2913 314.7359 Td
+/F1.0 6.5 Tf
 [<30313031>] TJ
 ET
-[0.3 0.6] 0.0 d
 0.3 w
 0.000 0.000 0.000 SCN
-248.0315 311.8867 m
-276.378 311.8867 l
+286.2992 311.3287 m
+306.1417 311.3287 l
 S
 [] 0 d
 0.3 w
 0.000 0.000 0.000 SCN
 BT
-250.0315 315.1857 Td
-/F1.0 6 Tf
+288.2992 314.7359 Td
+/F1.0 6.5 Tf
 [<35313031>] TJ
 ET
-[0.3 0.6] 0.0 d
 0.3 w
 0.000 0.000 0.000 SCN
-276.378 311.8867 m
-304.7244 311.8867 l
+306.1417 311.3287 m
+335.9055 311.3287 l
 S
 [] 0 d
 0.3 w
 0.000 0.000 0.000 SCN
 BT
-278.378 315.1857 Td
-/F1.0 6 Tf
+308.1417 314.7359 Td
+/F1.0 6.5 Tf
 [<554e>] TJ
 ET
-[0.3 0.6] 0.0 d
 0.3 w
 0.000 0.000 0.000 SCN
-304.7244 311.8867 m
-341.5748 311.8867 l
+335.9055 311.3287 m
+369.9213 311.3287 l
 S
 [] 0 d
 0.3 w
 0.000 0.000 0.000 SCN
 BT
-330.0748 315.1857 Td
-/F1.0 6 Tf
+357.5463 314.7359 Td
+/F1.0 6.5 Tf
 [<322c3030>] TJ
 ET
-[0.3 0.6] 0.0 d
 0.3 w
 0.000 0.000 0.000 SCN
-341.5748 311.8867 m
-384.0945 311.8867 l
+369.9213 311.3287 m
+403.937 311.3287 l
 S
 [] 0 d
 0.3 w
 0.000 0.000 0.000 SCN
 BT
-372.5945 315.1857 Td
-/F1.0 6 Tf
+391.562 314.7359 Td
+/F1.0 6.5 Tf
 [<312c3031>] TJ
 ET
-[0.3 0.6] 0.0 d
 0.3 w
 0.000 0.000 0.000 SCN
-384.0945 311.8867 m
-426.6142 311.8867 l
+403.937 311.3287 m
+437.9528 311.3287 l
 S
 [] 0 d
 0.3 w
 0.000 0.000 0.000 SCN
 BT
-415.1142 315.1857 Td
-/F1.0 6 Tf
+425.5778 314.7359 Td
+/F1.0 6.5 Tf
 [<322c3032>] TJ
 ET
-[0.3 0.6] 0.0 d
 0.3 w
 0.000 0.000 0.000 SCN
-426.6142 311.8867 m
-469.1339 311.8867 l
+437.9528 311.3287 m
+471.9685 311.3287 l
 S
 [] 0 d
 0.3 w
 0.000 0.000 0.000 SCN
-[0.3 0.6] 0.0 d
 0.3 w
 0.000 0.000 0.000 SCN
-469.1339 311.8867 m
-497.4803 311.8867 l
+471.9685 311.3287 m
+500.315 311.3287 l
 S
 [] 0 d
 0.3 w
 0.000 0.000 0.000 SCN
-[0.3 0.6] 0.0 d
 0.3 w
 0.000 0.000 0.000 SCN
-497.4803 311.8867 m
-525.8268 311.8867 l
+500.315 311.3287 m
+528.6614 311.3287 l
 S
 [] 0 d
 0.3 w
 0.000 0.000 0.000 SCN
-[0.3 0.6] 0.0 d
 0.3 w
 0.000 0.000 0.000 SCN
-525.8268 311.8867 m
-551.3386 311.8867 l
+528.6614 311.3287 m
+554.1732 311.3287 l
 S
 [] 0 d
 0.3 w
 0.000 0.000 0.000 SCN
-[0.3 0.6] 0.0 d
 0.3 w
 0.000 0.000 0.000 SCN
-551.3386 311.8867 m
-575.7165 311.8867 l
+554.1732 311.3287 m
+575.7165 311.3287 l
 S
 [] 0 d
 0.3 w
 0.000 0.000 0.000 SCN
-[0.3 0.6] 0.0 d
 0.3 w
 0.000 0.000 0.000 SCN
-21.2598 301.1907 m
-63.7795 301.1907 l
+21.2598 300.0747 m
+66.6142 300.0747 l
 S
 [] 0 d
 0.3 w
 0.000 0.000 0.000 SCN
 BT
-23.2598 304.4897 Td
-/F1.0 6 Tf
+23.2598 303.4819 Td
+/F1.0 6.5 Tf
 [<32>] TJ
 ET
-[0.3 0.6] 0.0 d
 0.3 w
 0.000 0.000 0.000 SCN
-63.7795 301.1907 m
-188.5039 301.1907 l
+66.6142 300.0747 m
+239.5276 300.0747 l
 S
 [] 0 d
 0.3 w
 0.000 0.000 0.000 SCN
 BT
-65.7795 304.4897 Td
-/F1.0 6 Tf
+68.6142 303.4819 Td
+/F1.0 6.5 Tf
 [<50726f6475746f20636f6d2043534f534e20313032202d2045737472616e676569726f>] TJ
 ET
-[0.3 0.6] 0.0 d
 0.3 w
 0.000 0.000 0.000 SCN
-188.5039 301.1907 m
-225.3543 301.1907 l
+239.5276 300.0747 m
+269.2913 300.0747 l
 S
 [] 0 d
 0.3 w
 0.000 0.000 0.000 SCN
 BT
-190.5039 304.4897 Td
-/F1.0 6 Tf
+241.5276 303.4819 Td
+/F1.0 6.5 Tf
 [<3233343536373839>] TJ
 ET
-[0.3 0.6] 0.0 d
 0.3 w
 0.000 0.000 0.000 SCN
-225.3543 301.1907 m
-248.0315 301.1907 l
+269.2913 300.0747 m
+286.2992 300.0747 l
 S
 [] 0 d
 0.3 w
 0.000 0.000 0.000 SCN
 BT
-227.3543 304.4897 Td
-/F1.0 6 Tf
+271.2913 303.4819 Td
+/F1.0 6.5 Tf
 [<31313032>] TJ
 ET
-[0.3 0.6] 0.0 d
 0.3 w
 0.000 0.000 0.000 SCN
-248.0315 301.1907 m
-276.378 301.1907 l
+286.2992 300.0747 m
+306.1417 300.0747 l
 S
 [] 0 d
 0.3 w
 0.000 0.000 0.000 SCN
 BT
-250.0315 304.4897 Td
-/F1.0 6 Tf
+288.2992 303.4819 Td
+/F1.0 6.5 Tf
 [<35313031>] TJ
 ET
-[0.3 0.6] 0.0 d
 0.3 w
 0.000 0.000 0.000 SCN
-276.378 301.1907 m
-304.7244 301.1907 l
+306.1417 300.0747 m
+335.9055 300.0747 l
 S
 [] 0 d
 0.3 w
 0.000 0.000 0.000 SCN
 BT
-278.378 304.4897 Td
-/F1.0 6 Tf
+308.1417 303.4819 Td
+/F1.0 6.5 Tf
 [<554e>] TJ
 ET
-[0.3 0.6] 0.0 d
 0.3 w
 0.000 0.000 0.000 SCN
-304.7244 301.1907 m
-341.5748 301.1907 l
+335.9055 300.0747 m
+369.9213 300.0747 l
 S
 [] 0 d
 0.3 w
 0.000 0.000 0.000 SCN
 BT
-330.0748 304.4897 Td
-/F1.0 6 Tf
+357.5463 303.4819 Td
+/F1.0 6.5 Tf
 [<342c3030>] TJ
 ET
-[0.3 0.6] 0.0 d
 0.3 w
 0.000 0.000 0.000 SCN
-341.5748 301.1907 m
-384.0945 301.1907 l
+369.9213 300.0747 m
+403.937 300.0747 l
 S
 [] 0 d
 0.3 w
 0.000 0.000 0.000 SCN
 BT
-372.5945 304.4897 Td
-/F1.0 6 Tf
+391.562 303.4819 Td
+/F1.0 6.5 Tf
 [<312c3032>] TJ
 ET
-[0.3 0.6] 0.0 d
 0.3 w
 0.000 0.000 0.000 SCN
-384.0945 301.1907 m
-426.6142 301.1907 l
+403.937 300.0747 m
+437.9528 300.0747 l
 S
 [] 0 d
 0.3 w
 0.000 0.000 0.000 SCN
 BT
-415.1142 304.4897 Td
-/F1.0 6 Tf
+425.5778 303.4819 Td
+/F1.0 6.5 Tf
 [<342c3038>] TJ
 ET
-[0.3 0.6] 0.0 d
 0.3 w
 0.000 0.000 0.000 SCN
-426.6142 301.1907 m
-469.1339 301.1907 l
+437.9528 300.0747 m
+471.9685 300.0747 l
 S
 [] 0 d
 0.3 w
 0.000 0.000 0.000 SCN
-[0.3 0.6] 0.0 d
 0.3 w
 0.000 0.000 0.000 SCN
-469.1339 301.1907 m
-497.4803 301.1907 l
+471.9685 300.0747 m
+500.315 300.0747 l
 S
 [] 0 d
 0.3 w
 0.000 0.000 0.000 SCN
-[0.3 0.6] 0.0 d
 0.3 w
 0.000 0.000 0.000 SCN
-497.4803 301.1907 m
-525.8268 301.1907 l
+500.315 300.0747 m
+528.6614 300.0747 l
 S
 [] 0 d
 0.3 w
 0.000 0.000 0.000 SCN
-[0.3 0.6] 0.0 d
 0.3 w
 0.000 0.000 0.000 SCN
-525.8268 301.1907 m
-551.3386 301.1907 l
+528.6614 300.0747 m
+554.1732 300.0747 l
 S
 [] 0 d
 0.3 w
 0.000 0.000 0.000 SCN
-[0.3 0.6] 0.0 d
 0.3 w
 0.000 0.000 0.000 SCN
-551.3386 301.1907 m
-575.7165 301.1907 l
+554.1732 300.0747 m
+575.7165 300.0747 l
 S
 [] 0 d
 0.3 w
 0.000 0.000 0.000 SCN
-[0.3 0.6] 0.0 d
 0.3 w
 0.000 0.000 0.000 SCN
-21.2598 277.1027 m
-63.7795 277.1027 l
+21.2598 281.5667 m
+66.6142 281.5667 l
 S
 [] 0 d
 0.3 w
 0.000 0.000 0.000 SCN
 BT
-23.2598 293.7937 Td
-/F1.0 6 Tf
+23.2598 292.2279 Td
+/F1.0 6.5 Tf
 [<33>] TJ
 ET
-[0.3 0.6] 0.0 d
 0.3 w
 0.000 0.000 0.000 SCN
-63.7795 277.1027 m
-188.5039 277.1027 l
+66.6142 281.5667 m
+239.5276 281.5667 l
 S
 [] 0 d
 0.3 w
 0.000 0.000 0.000 SCN
 BT
-65.7795 293.7937 Td
-/F1.0 6 Tf
+68.6142 292.2279 Td
+/F1.0 6.5 Tf
 [<50726f6475746f20436f6d2043736f736e20323031>] TJ
 ET
 BT
-65.7795 287.0977 Td
-/F1.0 6 Tf
-[<5354> 50 <3a204d56> 135 <413a2032342c303025202a20416ced713a2031372c303025202a2042433a20372c3636202a>] TJ
+68.6142 284.9739 Td
+/F1.0 6.5 Tf
+[<5354> 50 <3a204d56> 135 <413a2032342c303025202a20416ced713a2031372c303025202a2042433a20372c3636202a20566c723a20302c3235>] TJ
 ET
-BT
-65.7795 280.4017 Td
-/F1.0 6 Tf
-[<566c723a20302c3235>] TJ
-ET
-[0.3 0.6] 0.0 d
 0.3 w
 0.000 0.000 0.000 SCN
-188.5039 277.1027 m
-225.3543 277.1027 l
+239.5276 281.5667 m
+269.2913 281.5667 l
 S
 [] 0 d
 0.3 w
 0.000 0.000 0.000 SCN
 BT
-190.5039 293.7937 Td
-/F1.0 6 Tf
+241.5276 292.2279 Td
+/F1.0 6.5 Tf
 [<3435363738393031>] TJ
 ET
-[0.3 0.6] 0.0 d
 0.3 w
 0.000 0.000 0.000 SCN
-225.3543 277.1027 m
-248.0315 277.1027 l
+269.2913 281.5667 m
+286.2992 281.5667 l
 S
 [] 0 d
 0.3 w
 0.000 0.000 0.000 SCN
 BT
-227.3543 293.7937 Td
-/F1.0 6 Tf
+271.2913 292.2279 Td
+/F1.0 6.5 Tf
 [<30323031>] TJ
 ET
-[0.3 0.6] 0.0 d
 0.3 w
 0.000 0.000 0.000 SCN
-248.0315 277.1027 m
-276.378 277.1027 l
+286.2992 281.5667 m
+306.1417 281.5667 l
 S
 [] 0 d
 0.3 w
 0.000 0.000 0.000 SCN
 BT
-250.0315 293.7937 Td
-/F1.0 6 Tf
+288.2992 292.2279 Td
+/F1.0 6.5 Tf
 [<35343031>] TJ
 ET
-[0.3 0.6] 0.0 d
 0.3 w
 0.000 0.000 0.000 SCN
-276.378 277.1027 m
-304.7244 277.1027 l
+306.1417 281.5667 m
+335.9055 281.5667 l
 S
 [] 0 d
 0.3 w
 0.000 0.000 0.000 SCN
 BT
-278.378 293.7937 Td
-/F1.0 6 Tf
+308.1417 292.2279 Td
+/F1.0 6.5 Tf
 [<554e>] TJ
 ET
-[0.3 0.6] 0.0 d
 0.3 w
 0.000 0.000 0.000 SCN
-304.7244 277.1027 m
-341.5748 277.1027 l
+335.9055 281.5667 m
+369.9213 281.5667 l
 S
 [] 0 d
 0.3 w
 0.000 0.000 0.000 SCN
 BT
-330.0748 293.7937 Td
-/F1.0 6 Tf
+357.5463 292.2279 Td
+/F1.0 6.5 Tf
 [<362c3030>] TJ
 ET
-[0.3 0.6] 0.0 d
 0.3 w
 0.000 0.000 0.000 SCN
-341.5748 277.1027 m
-384.0945 277.1027 l
+369.9213 281.5667 m
+403.937 281.5667 l
 S
 [] 0 d
 0.3 w
 0.000 0.000 0.000 SCN
 BT
-372.5945 293.7937 Td
-/F1.0 6 Tf
+391.562 292.2279 Td
+/F1.0 6.5 Tf
 [<312c3033>] TJ
 ET
-[0.3 0.6] 0.0 d
 0.3 w
 0.000 0.000 0.000 SCN
-384.0945 277.1027 m
-426.6142 277.1027 l
+403.937 281.5667 m
+437.9528 281.5667 l
 S
 [] 0 d
 0.3 w
 0.000 0.000 0.000 SCN
 BT
-415.1142 293.7937 Td
-/F1.0 6 Tf
+425.5778 292.2279 Td
+/F1.0 6.5 Tf
 [<362c3138>] TJ
 ET
-[0.3 0.6] 0.0 d
 0.3 w
 0.000 0.000 0.000 SCN
-426.6142 277.1027 m
-469.1339 277.1027 l
+437.9528 281.5667 m
+471.9685 281.5667 l
 S
 [] 0 d
 0.3 w
 0.000 0.000 0.000 SCN
-[0.3 0.6] 0.0 d
 0.3 w
 0.000 0.000 0.000 SCN
-469.1339 277.1027 m
-497.4803 277.1027 l
+471.9685 281.5667 m
+500.315 281.5667 l
 S
 [] 0 d
 0.3 w
 0.000 0.000 0.000 SCN
-[0.3 0.6] 0.0 d
 0.3 w
 0.000 0.000 0.000 SCN
-497.4803 277.1027 m
-525.8268 277.1027 l
+500.315 281.5667 m
+528.6614 281.5667 l
 S
 [] 0 d
 0.3 w
 0.000 0.000 0.000 SCN
-[0.3 0.6] 0.0 d
 0.3 w
 0.000 0.000 0.000 SCN
-525.8268 277.1027 m
-551.3386 277.1027 l
+528.6614 281.5667 m
+554.1732 281.5667 l
 S
 [] 0 d
 0.3 w
 0.000 0.000 0.000 SCN
-[0.3 0.6] 0.0 d
 0.3 w
 0.000 0.000 0.000 SCN
-551.3386 277.1027 m
-575.7165 277.1027 l
+554.1732 281.5667 m
+575.7165 281.5667 l
 S
 [] 0 d
 0.3 w
 0.000 0.000 0.000 SCN
-[0.3 0.6] 0.0 d
 0.3 w
 0.000 0.000 0.000 SCN
-21.2598 266.4067 m
-63.7795 266.4067 l
+21.2598 270.3127 m
+66.6142 270.3127 l
 S
 [] 0 d
 0.3 w
 0.000 0.000 0.000 SCN
 BT
-23.2598 269.7057 Td
-/F1.0 6 Tf
+23.2598 273.7199 Td
+/F1.0 6.5 Tf
 [<38>] TJ
 ET
-[0.3 0.6] 0.0 d
 0.3 w
 0.000 0.000 0.000 SCN
-63.7795 266.4067 m
-188.5039 266.4067 l
+66.6142 270.3127 m
+239.5276 270.3127 l
 S
 [] 0 d
 0.3 w
 0.000 0.000 0.000 SCN
 BT
-65.7795 269.7057 Td
-/F1.0 6 Tf
+68.6142 273.7199 Td
+/F1.0 6.5 Tf
 [<50726f6475746f20636f6d2043534f534e20393030202d20436f6d2049434d53>] TJ
 ET
-[0.3 0.6] 0.0 d
 0.3 w
 0.000 0.000 0.000 SCN
-188.5039 266.4067 m
-225.3543 266.4067 l
+239.5276 270.3127 m
+269.2913 270.3127 l
 S
 [] 0 d
 0.3 w
 0.000 0.000 0.000 SCN
 BT
-190.5039 269.7057 Td
-/F1.0 6 Tf
+241.5276 273.7199 Td
+/F1.0 6.5 Tf
 [<3334353637383930>] TJ
 ET
-[0.3 0.6] 0.0 d
 0.3 w
 0.000 0.000 0.000 SCN
-225.3543 266.4067 m
-248.0315 266.4067 l
+269.2913 270.3127 m
+286.2992 270.3127 l
 S
 [] 0 d
 0.3 w
 0.000 0.000 0.000 SCN
 BT
-227.3543 269.7057 Td
-/F1.0 6 Tf
+271.2913 273.7199 Td
+/F1.0 6.5 Tf
 [<30393030>] TJ
 ET
-[0.3 0.6] 0.0 d
 0.3 w
 0.000 0.000 0.000 SCN
-248.0315 266.4067 m
-276.378 266.4067 l
+286.2992 270.3127 m
+306.1417 270.3127 l
 S
 [] 0 d
 0.3 w
 0.000 0.000 0.000 SCN
 BT
-250.0315 269.7057 Td
-/F1.0 6 Tf
+288.2992 273.7199 Td
+/F1.0 6.5 Tf
 [<35323031>] TJ
 ET
-[0.3 0.6] 0.0 d
 0.3 w
 0.000 0.000 0.000 SCN
-276.378 266.4067 m
-304.7244 266.4067 l
+306.1417 270.3127 m
+335.9055 270.3127 l
 S
 [] 0 d
 0.3 w
 0.000 0.000 0.000 SCN
 BT
-278.378 269.7057 Td
-/F1.0 6 Tf
+308.1417 273.7199 Td
+/F1.0 6.5 Tf
 [<554e>] TJ
 ET
-[0.3 0.6] 0.0 d
 0.3 w
 0.000 0.000 0.000 SCN
-304.7244 266.4067 m
-341.5748 266.4067 l
+335.9055 270.3127 m
+369.9213 270.3127 l
 S
 [] 0 d
 0.3 w
 0.000 0.000 0.000 SCN
 BT
-327.0748 269.7057 Td
-/F1.0 6 Tf
+354.2963 273.7199 Td
+/F1.0 6.5 Tf
 [<31362c3030>] TJ
 ET
-[0.3 0.6] 0.0 d
 0.3 w
 0.000 0.000 0.000 SCN
-341.5748 266.4067 m
-384.0945 266.4067 l
+369.9213 270.3127 m
+403.937 270.3127 l
 S
 [] 0 d
 0.3 w
 0.000 0.000 0.000 SCN
 BT
-372.5945 269.7057 Td
-/F1.0 6 Tf
+391.562 273.7199 Td
+/F1.0 6.5 Tf
 [<312c3038>] TJ
 ET
-[0.3 0.6] 0.0 d
 0.3 w
 0.000 0.000 0.000 SCN
-384.0945 266.4067 m
-426.6142 266.4067 l
+403.937 270.3127 m
+437.9528 270.3127 l
 S
 [] 0 d
 0.3 w
 0.000 0.000 0.000 SCN
 BT
-412.1142 269.7057 Td
-/F1.0 6 Tf
+422.3278 273.7199 Td
+/F1.0 6.5 Tf
 [<31372c3238>] TJ
 ET
-[0.3 0.6] 0.0 d
 0.3 w
 0.000 0.000 0.000 SCN
-426.6142 266.4067 m
-469.1339 266.4067 l
+437.9528 270.3127 m
+471.9685 270.3127 l
 S
 [] 0 d
 0.3 w
 0.000 0.000 0.000 SCN
 BT
-457.6339 269.7057 Td
-/F1.0 6 Tf
+459.5935 273.7199 Td
+/F1.0 6.5 Tf
 [<392c3837>] TJ
 ET
-[0.3 0.6] 0.0 d
 0.3 w
 0.000 0.000 0.000 SCN
-469.1339 266.4067 m
-497.4803 266.4067 l
+471.9685 270.3127 m
+500.315 270.3127 l
 S
 [] 0 d
 0.3 w
 0.000 0.000 0.000 SCN
 BT
-485.9803 269.7057 Td
-/F1.0 6 Tf
+487.94 273.7199 Td
+/F1.0 6.5 Tf
 [<372c3635>] TJ
 ET
-[0.3 0.6] 0.0 d
 0.3 w
 0.000 0.000 0.000 SCN
-497.4803 266.4067 m
-525.8268 266.4067 l
+500.315 270.3127 m
+528.6614 270.3127 l
 S
 [] 0 d
 0.3 w
 0.000 0.000 0.000 SCN
-[0.3 0.6] 0.0 d
 0.3 w
 0.000 0.000 0.000 SCN
-525.8268 266.4067 m
-551.3386 266.4067 l
+528.6614 270.3127 m
+554.1732 270.3127 l
 S
 [] 0 d
 0.3 w
 0.000 0.000 0.000 SCN
 BT
-539.8386 269.7057 Td
-/F1.0 6 Tf
+541.7982 273.7199 Td
+/F1.0 6.5 Tf
 [<382c3736>] TJ
 ET
-[0.3 0.6] 0.0 d
 0.3 w
 0.000 0.000 0.000 SCN
-551.3386 266.4067 m
-575.7165 266.4067 l
+554.1732 270.3127 m
+575.7165 270.3127 l
 S
 [] 0 d
 0.3 w
@@ -843,13 +780,13 @@ xref
 0000000109 00000 n
 0000000158 00000 n
 0000000215 00000 n
-0000009634 00000 n
-0000009814 00000 n
+0000008763 00000 n
+0000008943 00000 n
 trailer
 << /Size 7
 /Root 2 0 R
 /Info 1 0 R
 >>
 startxref
-9913
+9042
 %%EOF