summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Allen <dan.j.allen@gmail.com>2022-08-21 23:40:07 -0600
committerGitHub <noreply@github.com>2022-08-21 23:40:07 -0600
commite899f364a4e48679d1fa4adb2a10dfe4e9e764f4 (patch)
tree5005d93279f6bc6a0f2080bef5cebe10d68d7edf
parenta2c637f931c091a0950b12f21a597ef1db1b3e87 (diff)
resolves #2318 allow theme to specify width for image-based admonition icons (PR #2319)
* introduce scale theme key for admonition icon to scale down icon without affecting layout * introduce width theme key for admonition icon to control width of image-based icon
-rw-r--r--CHANGELOG.adoc2
-rw-r--r--docs/modules/theme/pages/admonition.adoc24
-rw-r--r--lib/asciidoctor/pdf/converter.rb25
-rw-r--r--spec/admonition_spec.rb40
-rw-r--r--spec/reference/admonition-icon-image.pdf2092
5 files changed, 1114 insertions, 1069 deletions
diff --git a/CHANGELOG.adoc b/CHANGELOG.adoc
index 7aa36cee..b8ef912a 100644
--- a/CHANGELOG.adoc
+++ b/CHANGELOG.adoc
@@ -13,6 +13,8 @@ Enhancements::
* allow font settings to be specified per side of a running content periphery (#2316)
* don't split code block that has less than breakable minimum lines (#2304)
* allow theme to set minimum height of orphans for code blocks (#2304)
+* introduce `scale` theme key for admonition icon to scale down icon without affecting layout (#2318)
+* introduce `width` theme key for admonition icon to control width of image-based icon (#2318)
== 2.3.0 (2022-08-16) - @mojavelinux
diff --git a/docs/modules/theme/pages/admonition.adoc b/docs/modules/theme/pages/admonition.adoc
index 3e59a52b..cb4abc6c 100644
--- a/docs/modules/theme/pages/admonition.adoc
+++ b/docs/modules/theme/pages/admonition.adoc
@@ -296,6 +296,8 @@ The `image` key is only relevant when image-based icons are used (`icons=image`)
It's an alternative to using the `icon` attribute on the admonition block.
The path is resolved starting from the location of the AsciiDoc document and relative to the value of the `iconsdir` attribute.
The image macro syntax is not supported for this key.
+The width is controlled by the `width` key.
+The `width` key is only used for image-based icons.
[cols="3,5,6a"]
|===
@@ -319,14 +321,23 @@ admonition:
tip:
name: fas-fire
+|scale
+|Number in range (0,1] +
+(default: `2 / 3`)
+|[source]
+admonition:
+ icon:
+ note:
+ scale: 1
+
|size
|xref:language.adoc#values[Number] +
-(default: `24`)
+(default: `36`)
|[source]
admonition:
icon:
note:
- size: 20
+ size: 24
|stroke-color
|xref:color.adoc[Color] +
@@ -336,6 +347,15 @@ admonition:
icon:
important:
stroke-color: #FF0000
+
+|width
+|xref:measurement-units.adoc[Measurement] +
+(default: `36`)
+|[source]
+admonition:
+ icon:
+ important:
+ width: 24
|===
[#name]
diff --git a/lib/asciidoctor/pdf/converter.rb b/lib/asciidoctor/pdf/converter.rb
index 8492f667..bf0d5c33 100644
--- a/lib/asciidoctor/pdf/converter.rb
+++ b/lib/asciidoctor/pdf/converter.rb
@@ -40,12 +40,12 @@ module Asciidoctor
OptimizerRequirePath = ::File.join __dir__, 'optimizer'
AdmonitionIcons = {
- caution: { name: 'fas-fire', stroke_color: 'BF3400', size: 24 },
- important: { name: 'fas-exclamation-circle', stroke_color: 'BF0000', size: 24 },
- note: { name: 'fas-info-circle', stroke_color: '19407C', size: 24 },
- tip: { name: 'far-lightbulb', stroke_color: '111111', size: 24 },
- warning: { name: 'fas-exclamation-triangle', stroke_color: 'BF6900', size: 24 },
- }
+ caution: { name: 'fas-fire', stroke_color: 'BF3400' },
+ important: { name: 'fas-exclamation-circle', stroke_color: 'BF0000' },
+ note: { name: 'fas-info-circle', stroke_color: '19407C' },
+ tip: { name: 'far-lightbulb', stroke_color: '111111' },
+ warning: { name: 'fas-exclamation-triangle', stroke_color: 'BF6900' },
+ }.transform_values {|val| val.merge size: 36 }
TextAlignmentNames = { 'justify' => true, 'left' => true, 'center' => true, 'right' => true }
IndentableTextAlignments = { justify: true, left: true }
TextAlignmentRoles = { 'text-justify' => true, 'text-left' => true, 'text-center' => true, 'text-right' => true }
@@ -882,15 +882,16 @@ module Asciidoctor
if !(has_icon = node.attr? 'icon') && (doc.attr 'icons') == 'font'
icons = 'font'
icon_data = admonition_icon_data type.to_sym
- icon_size = icon_data[:size] || 24
- label_width = label_min_width || (icon_size * 1.5)
+ icon_size = (label_width = icon_data[:size] || 36) * (icon_data[:scale] || 2/3r).to_f
+ label_width = label_min_width if label_min_width && label_min_width > label_width
elsif (icon_path = has_icon || !(icon_path = (@theme[%(admonition_icon_#{type})] || {})[:image]) ?
(get_icon_image_path node, type) :
(ThemeLoader.resolve_theme_asset (apply_subs_discretely doc, icon_path, subs: [:attributes], imagesdir: @themesdir), @themesdir)) &&
(::File.readable? icon_path)
icons = true
- # TODO: introduce @theme.admonition_image_width? or use size key from admonition_icon_<name>?
- label_width = label_min_width || 36.0
+ icon_data = admonition_icon_data type.to_sym
+ icon_width = (label_width = icon_data[:width] || 36) * (icon_data[:scale] || 2/3r).to_f
+ label_width = label_min_width if label_min_width && label_min_width > label_width
else
log :warn, %(admonition icon image#{has_icon ? '' : ' for ' + type.upcase} not found or not readable: #{icon_path || (get_icon_image_path node, type, false)})
end
@@ -949,7 +950,7 @@ module Asciidoctor
svg_obj = ::Prawn::SVG::Interface.new (::File.read icon_path, mode: 'r:UTF-8'), self,
position: label_text_align,
vposition: label_valign,
- width: label_width,
+ width: icon_width,
height: label_height,
fallback_font_name: fallback_svg_font_name,
enable_web_requests: allow_uri_read ? (method :load_open_uri).to_proc : false,
@@ -969,7 +970,7 @@ module Asciidoctor
image_obj, image_info = ::File.open(icon_path, 'rb') {|fd| build_image_object fd }
icon_aspect_ratio = image_info.width.fdiv image_info.height
# NOTE: don't scale image up if smaller than label_width
- icon_width = [(to_pt image_info.width, :px), label_width].min
+ #icon_width = [(to_pt image_info.width, :px), icon_width].min
if (icon_height = icon_width * (1 / icon_aspect_ratio)) > label_height
icon_width *= label_height / icon_height
end
diff --git a/spec/admonition_spec.rb b/spec/admonition_spec.rb
index 9978eea2..d09eb3dd 100644
--- a/spec/admonition_spec.rb
+++ b/spec/admonition_spec.rb
@@ -436,7 +436,7 @@ describe 'Asciidoctor::PDF::Converter - Admonition' do
end
it 'should not reduce font size of icon if specified size fits within available space' do
- pdf = to_pdf <<~'EOS', pdf_theme: { admonition_icon_important: { size: 50 } }, analyze: true
+ pdf = to_pdf <<~'EOS', pdf_theme: { admonition_icon_important: { size: 50, scale: 1 } }, analyze: true
:icons: font
[IMPORTANT]
@@ -602,7 +602,7 @@ describe 'Asciidoctor::PDF::Converter - Admonition' do
page_column_gap: 12,
admonition_padding: 0,
admonition_column_rule_width: 0,
- admonition_label_min_width: 24,
+ admonition_icon_tip: { width: 24, scale: 1 },
}
pdf = to_pdf <<~'EOS', pdf_theme: pdf_theme, analyze: true
:icons: svg
@@ -778,7 +778,8 @@ describe 'Asciidoctor::PDF::Converter - Admonition' do
end
it 'should use original width of SVG icon if height is less than height of admonition block', visual: true do
- to_file = to_pdf_file <<~'EOS', 'admonition-custom-svg-fit.pdf', attribute_overrides: { 'docdir' => fixtures_dir }
+ pdf_theme = { admonition_icon_note: { width: 36, scale: 1 } }
+ to_file = to_pdf_file <<~'EOS', 'admonition-custom-svg-fit.pdf', pdf_theme: pdf_theme, attribute_overrides: { 'docdir' => fixtures_dir }
:icons: font
:iconsdir:
@@ -805,9 +806,8 @@ describe 'Asciidoctor::PDF::Converter - Admonition' do
(expect to_file).to visually_match 'admonition-custom-raster-icon.pdf'
end
- # NOTE: this is a pretty flimsy feature and probably needs some rethink
- it 'should allow theme to control width of admonition icon image using admonition_label_min_width key' do
- pdf_theme = { admonition_label_min_width: 40 }
+ it 'should allow theme to control width of admonition icon image using width key' do
+ pdf_theme = { admonition_icon_tip: { scale: 0.6, width: 40 } }
pdf = to_pdf <<~'EOS', pdf_theme: pdf_theme, attribute_overrides: { 'docdir' => fixtures_dir }, analyze: :image
:icons: font
:iconsdir:
@@ -822,7 +822,28 @@ describe 'Asciidoctor::PDF::Converter - Admonition' do
images = pdf.images
(expect images).to have_size 1
- (expect images[0][:width]).to eql 40.0
+ (expect images[0][:width]).to eql 24.0
+ (expect images[0][:x]).to eql 68.24
+ end
+
+ it 'should allow theme to control spacing around admonition icon image using admonition_label_min_width key' do
+ pdf_theme = { admonition_label_min_width: 40, admonition_icon_tip: { scale: 1, width: 24 } }
+ pdf = to_pdf <<~'EOS', pdf_theme: pdf_theme, attribute_overrides: { 'docdir' => fixtures_dir }, analyze: :image
+ :icons: font
+ :iconsdir:
+
+ [TIP,icon=logo.png]
+ ====
+ Use the icon attribute to customize the image for an admonition block.
+
+ Use the admonition_label_min_width key to control the image width.
+ ====
+ EOS
+
+ images = pdf.images
+ (expect images).to have_size 1
+ (expect images[0][:width]).to eql 24.0
+ (expect images[0][:x]).to eql 68.24
end
it 'should resolve icon when icons attribute is set to image', visual: true do
@@ -919,7 +940,8 @@ describe 'Asciidoctor::PDF::Converter - Admonition' do
end
it 'should resize icon only if it does not fit within the available space' do
- pdf = to_pdf <<~'EOS', attribute_overrides: { 'docdir' => fixtures_dir }, analyze: :image
+ pdf_theme = { admonition_icon_tip: { scale: 1 } }
+ pdf = to_pdf <<~'EOS', pdf_theme: pdf_theme, attribute_overrides: { 'docdir' => fixtures_dir }, analyze: :image
:icons: image
:iconsdir:
@@ -933,7 +955,7 @@ describe 'Asciidoctor::PDF::Converter - Admonition' do
(expect images[0][:width]).to be < 36.0
(expect images[0][:height]).to be < 42.3529
- pdf = to_pdf <<~'EOS', attribute_overrides: { 'docdir' => fixtures_dir }, analyze: :image
+ pdf = to_pdf <<~'EOS', pdf_theme: pdf_theme, attribute_overrides: { 'docdir' => fixtures_dir }, analyze: :image
:icons: image
:iconsdir:
diff --git a/spec/reference/admonition-icon-image.pdf b/spec/reference/admonition-icon-image.pdf
index 5fd95e33..7a3974c0 100644
--- a/spec/reference/admonition-icon-image.pdf
+++ b/spec/reference/admonition-icon-image.pdf
@@ -2,10 +2,10 @@
%ÿÿÿÿ
1 0 obj
<< /Title (Untitled)
-/Creator (Asciidoctor PDF 2.0.0-dev, based on Prawn 2.4.0)
-/Producer (Asciidoctor PDF 2.0.0-dev, based on Prawn 2.4.0)
-/ModDate (D:20220426174919-06'00')
-/CreationDate (D:20220426174919-06'00')
+/Creator (Asciidoctor PDF 2.3.0, based on Prawn 2.4.0)
+/Producer (Asciidoctor PDF 2.3.0, based on Prawn 2.4.0)
+/ModDate (D:20220818030841-06'00')
+/CreationDate (D:20220818030841-06'00')
>>
endobj
2 0 obj
@@ -48,7 +48,7 @@ endobj
>>
endobj
6 0 obj
-<< /Length 19760
+<< /Length 19761
>>
stream
q
@@ -61,16 +61,16 @@ q
S
Q
q
-60.24 766.33 m
-96.24 766.33 l
-96.24 805.89 l
-60.24 805.89 l
+66.24 766.33 m
+90.24 766.33 l
+90.24 805.89 l
+66.24 805.89 l
h
W n
/DeviceRGB cs
0.0 0.0 0.0 scn
-0.072 0.0 0.0 0.072 55.90272 747.86592 cm
-1.0 0.0 0.0 1.0 0.0 -24.72222 cm
+0.048 0.0 0.0 0.048 63.06048 767.20728 cm
+1.0 0.0 0.0 1.0 0.0 -162.08333 cm
q
1.0 1.0 1.0 scn
/DeviceRGB CS
@@ -78,34 +78,34 @@ q
4.41725076 w
1 J
2 j
-62.245 738.29 m
-62.245 741.847 l
-62.245 753.183 64.996 763.096 70.498 772.961 c
-76.048 782.827 83.494 789.989 93.218 795.633 c
-100.806 800.186 108.442 802.463 116.695 803.601 c
-116.695 803.886 l
-503.392 803.886 l
-503.392 803.601 l
-511.692 802.463 519.281 800.186 526.917 795.633 c
-536.64 789.989 543.897 782.685 549.589 772.961 c
-555.281 763.237 557.841 753.183 557.841 741.847 c
-557.841 738.29 l
-557.841 738.29 l
-557.841 373.933 l
-557.841 373.933 l
-557.841 370.186 l
-557.841 359.04 555.091 349.127 549.589 339.262 c
-544.087 329.349 536.64 322.234 526.917 316.59 c
-519.281 312.037 511.692 309.76 503.392 308.622 c
-503.392 308.29 l
-116.695 308.29 l
-116.695 308.622 l
-108.442 309.76 100.806 312.037 93.217 316.59 c
-83.494 322.234 76.19 329.538 70.498 339.262 c
-64.854 348.985 62.245 359.04 62.245 370.186 c
-62.245 373.933 l
-62.245 373.933 l
-62.245 738.29 l
+68.245 738.29 m
+68.245 741.847 l
+68.245 753.183 70.996 763.096 76.498 772.961 c
+82.048 782.827 89.494 789.989 99.218 795.633 c
+106.806 800.186 114.442 802.463 122.695 803.601 c
+122.695 803.886 l
+509.392 803.886 l
+509.392 803.601 l
+517.692 802.463 525.281 800.186 532.917 795.633 c
+542.64 789.989 549.897 782.685 555.589 772.961 c
+561.281 763.237 563.841 753.183 563.841 741.847 c
+563.841 738.29 l
+563.841 738.29 l
+563.841 373.933 l
+563.841 373.933 l
+563.841 370.186 l
+563.841 359.04 561.091 349.127 555.589 339.262 c
+550.087 329.349 542.64 322.234 532.917 316.59 c
+525.281 312.037 517.692 309.76 509.392 308.622 c
+509.392 308.29 l
+122.695 308.29 l
+122.695 308.622 l
+114.442 309.76 106.806 312.037 99.217 316.59 c
+89.494 322.234 82.19 329.538 76.498 339.262 c
+70.854 348.985 68.245 359.04 68.245 370.186 c
+68.245 373.933 l
+68.245 373.933 l
+68.245 738.29 l
h
B*
Q
@@ -113,1075 +113,1075 @@ q
28.222 w
q
2 j
-357.584 334.938 m
-360.667 344.328 l
-363.75 359.079 l
-365.837 374.92 l
-366.643 390.003 l
-365.837 404.421 l
-364.082 418.365 l
-360.667 432.783 l
-356.446 446.727 l
-352.746 455.787 l
-348.193 466.457 l
-336.052 491.263 l
-324.384 519.625 l
-319.499 535.182 l
-315.799 550.549 l
-313.333 566.437 l
-313.049 581.994 l
-313.855 589.914 l
-314.804 597.361 l
-317.222 605.329 l
-319.831 612.586 l
-323.578 620.032 l
-327.752 627.194 l
-333.112 634.45 l
-339.419 640.948 l
-346.723 647.588 l
-354.976 653.754 l
-374.611 665.421 l
-396.144 674.812 l
-416.064 679.84 l
-425.644 680.978 l
-434.229 681.31 l
-442.956 680.978 l
-450.924 679.508 l
-458.844 677.563 l
-465.959 674.813 l
-473.073 671.919 l
-480.045 667.698 l
-492.377 658.307 l
-503.855 647.256 l
-513.909 634.782 l
-523.016 620.886 l
-531.743 606.467 l
-538.857 591.717 l
-551.852 562.217 l
-556.358 550.549 l
-556.358 372.359 l
-556.358 361.024 553.608 351.585 547.963 341.246 c
-542.272 330.859 535.157 324.219 525.435 318.717 c
-517.799 314.496 510.21 311.935 501.91 310.797 c
-501.91 310.275 l
-350.47 310.275 l
-357.584 334.938 l
+363.584 334.938 m
+366.667 344.328 l
+369.75 359.079 l
+371.837 374.92 l
+372.643 390.003 l
+371.837 404.421 l
+370.082 418.365 l
+366.667 432.783 l
+362.446 446.727 l
+358.746 455.787 l
+354.193 466.457 l
+342.052 491.263 l
+330.384 519.625 l
+325.499 535.182 l
+321.799 550.549 l
+319.333 566.437 l
+319.049 581.994 l
+319.855 589.914 l
+320.804 597.361 l
+323.222 605.329 l
+325.831 612.586 l
+329.578 620.032 l
+333.752 627.194 l
+339.112 634.45 l
+345.419 640.948 l
+352.723 647.588 l
+360.976 653.754 l
+380.611 665.421 l
+402.144 674.812 l
+422.064 679.84 l
+431.644 680.978 l
+440.229 681.31 l
+448.956 680.978 l
+456.924 679.508 l
+464.844 677.563 l
+471.959 674.813 l
+479.073 671.919 l
+486.045 667.698 l
+498.377 658.307 l
+509.855 647.256 l
+519.909 634.782 l
+529.016 620.886 l
+537.743 606.467 l
+544.857 591.717 l
+557.852 562.217 l
+562.358 550.549 l
+562.358 372.359 l
+562.358 361.024 559.608 351.585 553.963 341.246 c
+548.272 330.859 541.157 324.219 531.435 318.717 c
+523.799 314.496 516.21 311.935 507.91 310.797 c
+507.91 310.275 l
+356.47 310.275 l
+363.584 334.938 l
h
f*
Q
q
2 j
-313.001 681.31 m
-556.453 681.31 l
-556.453 310.227 l
-313.001 310.227 l
+319.001 681.31 m
+562.453 681.31 l
+562.453 310.227 l
+319.001 310.227 l
h
n
Q
q
1.0 1.0 1.0 scn
2 j
-556.911 375.31 m
-556.579 375.31 l
-556.911 373.84 556.911 372.701 556.911 371.279 c
-556.911 359.896 554.161 350.505 548.659 340.308 c
-543.157 330.11 535.711 323.281 525.988 317.637 c
-518.02 313.415 510.763 310.807 502.511 309.717 c
-502.511 309.384 l
-408.364 309.384 l
-408.364 314.222 l
-408.839 320.245 l
-408.839 326.221 l
-408.364 332.387 l
-408.364 338.363 l
-408.032 344.339 l
-408.032 350.505 l
-407.7 356.528 l
-406.894 362.504 l
-406.562 368.67 l
-405.756 374.646 l
-405.139 380.337 l
-404.333 385.981 l
-403.195 392.005 l
-402.056 397.317 l
-401.25 399.926 l
-400.586 402.676 l
-399.78 405.285 l
-398.974 407.846 l
-398.31 410.644 l
-397.503 413.206 l
-396.839 415.814 l
-395.559 418.091 l
-395.227 418.897 l
-394.895 420.035 l
-394.895 421.174 l
-394.42 421.79 l
-394.088 424.067 l
-394.088 427.956 l
-394.42 430.043 l
-394.895 431.987 l
-395.227 434.264 l
-395.891 436.209 l
-396.839 438.153 l
-397.835 440.43 l
-398.974 442.232 l
-400.586 444.462 l
-402.056 446.406 l
-403.479 448.682 l
-405.139 450.627 l
-406.894 452.429 l
-408.839 454.706 l
-410.783 456.65 l
-412.918 458.595 l
-415.337 460.35 l
-417.423 462.294 l
-419.843 464.097 l
-422.451 466.041 l
-424.727 467.986 l
-427.336 469.409 l
-429.897 471.353 l
-432.648 472.823 l
-435.731 474.768 l
-438.339 476.238 l
-441.233 477.708 l
-443.983 479.321 l
-446.924 480.46 l
-450.007 481.93 l
-453.09 483.02 l
-456.173 484.491 l
-459.066 485.629 l
-461.674 486.768 l
-465.232 487.574 l
-468.125 488.712 l
-470.733 489.518 l
-473.816 490.182 l
-476.709 490.989 l
-479.792 491.795 l
-482.543 492.127 l
-485.483 492.459 l
-488.566 492.933 l
-491.128 493.265 l
-499.096 493.265 l
-501.656 492.933 l
-504.123 492.933 l
-506.684 492.459 l
-508.961 491.795 l
-511.237 491.463 l
-513.182 490.514 l
-514.984 489.518 l
-517.214 488.712 l
-518.684 487.574 l
-520.628 486.104 l
-522.098 484.965 l
-523.711 483.021 l
-524.517 482.214 l
-524.849 481.598 l
-527.458 478.041 l
-530.019 474.436 l
-532.628 471.069 l
-535.711 467.179 l
-538.793 463.433 l
-541.876 459.543 l
-545.102 455.512 l
-548.184 451.622 l
-551.552 447.876 l
-554.967 443.655 l
-556.911 441.9 l
-556.911 375.31 l
+562.911 375.31 m
+562.579 375.31 l
+562.911 373.84 562.911 372.701 562.911 371.279 c
+562.911 359.896 560.161 350.505 554.659 340.308 c
+549.157 330.11 541.711 323.281 531.988 317.637 c
+524.02 313.415 516.763 310.807 508.511 309.717 c
+508.511 309.384 l
+414.364 309.384 l
+414.364 314.222 l
+414.839 320.245 l
+414.839 326.221 l
+414.364 332.387 l
+414.364 338.363 l
+414.032 344.339 l
+414.032 350.505 l
+413.7 356.528 l
+412.894 362.504 l
+412.562 368.67 l
+411.756 374.646 l
+411.139 380.337 l
+410.333 385.981 l
+409.195 392.005 l
+408.056 397.317 l
+407.25 399.926 l
+406.586 402.676 l
+405.78 405.285 l
+404.974 407.846 l
+404.31 410.644 l
+403.503 413.206 l
+402.839 415.814 l
+401.559 418.091 l
+401.227 418.897 l
+400.895 420.035 l
+400.895 421.174 l
+400.42 421.79 l
+400.088 424.067 l
+400.088 427.956 l
+400.42 430.043 l
+400.895 431.987 l
+401.227 434.264 l
+401.891 436.209 l
+402.839 438.153 l
+403.835 440.43 l
+404.974 442.232 l
+406.586 444.462 l
+408.056 446.406 l
+409.479 448.682 l
+411.139 450.627 l
+412.894 452.429 l
+414.839 454.706 l
+416.783 456.65 l
+418.918 458.595 l
+421.337 460.35 l
+423.423 462.294 l
+425.843 464.097 l
+428.451 466.041 l
+430.727 467.986 l
+433.336 469.409 l
+435.897 471.353 l
+438.648 472.823 l
+441.731 474.768 l
+444.339 476.238 l
+447.233 477.708 l
+449.983 479.321 l
+452.924 480.46 l
+456.007 481.93 l
+459.09 483.02 l
+462.173 484.491 l
+465.066 485.629 l
+467.674 486.768 l
+471.232 487.574 l
+474.125 488.712 l
+476.733 489.518 l
+479.816 490.182 l
+482.709 490.989 l
+485.792 491.795 l
+488.543 492.127 l
+491.483 492.459 l
+494.566 492.933 l
+497.128 493.265 l
+505.096 493.265 l
+507.656 492.933 l
+510.123 492.933 l
+512.684 492.459 l
+514.961 491.795 l
+517.237 491.463 l
+519.182 490.514 l
+520.984 489.518 l
+523.214 488.712 l
+524.684 487.574 l
+526.628 486.104 l
+528.098 484.965 l
+529.711 483.021 l
+530.517 482.214 l
+530.849 481.598 l
+533.458 478.041 l
+536.019 474.436 l
+538.628 471.069 l
+541.711 467.179 l
+544.793 463.433 l
+547.876 459.543 l
+551.102 455.512 l
+554.184 451.622 l
+557.552 447.876 l
+560.967 443.655 l
+562.911 441.9 l
+562.911 375.31 l
h
f*
Q
q
2 j
-393.25 493.867 m
-556.168 493.867 l
-556.168 309.89 l
-393.25 309.89 l
+399.25 493.867 m
+562.168 493.867 l
+562.168 309.89 l
+399.25 309.89 l
h
n
Q
q
1.0 1.0 1.0 scn
2 j
-411.274 537.743 m
-412.507 535.466 l
-413.693 532.621 l
-414.214 530.012 l
-415.068 527.925 l
-415.732 525.365 l
-416.443 522.708 l
-416.538 520.289 l
-416.918 517.633 l
-416.87 515.167 l
-417.107 512.843 l
-416.917 510.329 l
-416.586 508.1 l
-416.491 506.108 l
-415.874 503.784 l
-415.068 501.887 l
-414.451 499.895 l
-414.119 499.041 l
-413.645 497.998 l
-412.744 496.385 l
-411.654 494.725 l
-410.278 493.302 l
-409.187 492.164 l
-407.859 491.074 l
-406.341 490.124 l
-404.681 489.081 l
-403.306 488.559 l
-401.361 488.133 l
-399.559 487.373 l
-397.946 487.563 l
-396.191 487.563 l
-394.247 487.658 l
-392.634 487.706 l
-390.215 488.465 l
-388.318 489.271 l
-386.421 489.745 l
-384.334 490.978 l
-382.722 491.927 l
-380.635 493.16 l
-378.88 494.535 l
-377.03 496.101 l
-375.086 497.903 l
-373.046 499.895 l
-371.623 501.745 l
-369.916 503.832 l
-368.303 505.634 l
-366.975 508.1 l
-365.695 510.377 l
-364.272 512.606 l
-362.944 515.025 l
-361.853 517.728 l
-360.809 520.289 l
-359.861 522.661 l
-359.339 524.89 l
-358.817 527.498 l
-358.153 530.012 l
-358.011 532.432 l
-357.3 535.087 l
-357.205 537.506 l
-357.395 540.02 l
-357.3 542.439 l
-357.632 544.668 l
-358.012 546.755 l
-358.343 548.984 l
-359.149 550.881 l
-360.098 552.825 l
-360.43 553.821 l
-360.857 554.912 l
-361.805 556.477 l
-362.849 558.137 l
-363.987 559.323 l
-365.457 560.793 l
-366.691 561.647 l
-367.876 562.643 l
-369.536 563.687 l
-371.339 564.398 l
-372.999 565.062 l
-374.469 565.299 l
-376.461 565.584 l
-378.074 565.536 l
-380.35 565.062 l
-382.105 565.062 l
-383.006 564.588 l
-384.002 564.256 l
-386.184 563.924 l
-388.176 562.975 l
-390.073 562.169 l
-391.78 560.936 l
-393.535 559.56 l
-395.622 558.327 l
-397.519 556.667 l
-399.416 554.96 l
-401.029 553.157 l
-403.069 551.213 l
-404.491 549.316 l
-405.961 546.944 l
-407.527 544.81 l
-408.807 542.533 l
-410.23 540.304 l
-411.274 537.744 l
+417.274 537.743 m
+418.507 535.466 l
+419.693 532.621 l
+420.214 530.012 l
+421.068 527.925 l
+421.732 525.365 l
+422.443 522.708 l
+422.538 520.289 l
+422.918 517.633 l
+422.87 515.167 l
+423.107 512.843 l
+422.917 510.329 l
+422.586 508.1 l
+422.491 506.108 l
+421.874 503.784 l
+421.068 501.887 l
+420.451 499.895 l
+420.119 499.041 l
+419.645 497.998 l
+418.744 496.385 l
+417.654 494.725 l
+416.278 493.302 l
+415.187 492.164 l
+413.859 491.074 l
+412.341 490.124 l
+410.681 489.081 l
+409.306 488.559 l
+407.361 488.133 l
+405.559 487.373 l
+403.946 487.563 l
+402.191 487.563 l
+400.247 487.658 l
+398.634 487.706 l
+396.215 488.465 l
+394.318 489.271 l
+392.421 489.745 l
+390.334 490.978 l
+388.722 491.927 l
+386.635 493.16 l
+384.88 494.535 l
+383.03 496.101 l
+381.086 497.903 l
+379.046 499.895 l
+377.623 501.745 l
+375.916 503.832 l
+374.303 505.634 l
+372.975 508.1 l
+371.695 510.377 l
+370.272 512.606 l
+368.944 515.025 l
+367.853 517.728 l
+366.809 520.289 l
+365.861 522.661 l
+365.339 524.89 l
+364.817 527.498 l
+364.153 530.012 l
+364.011 532.432 l
+363.3 535.087 l
+363.205 537.506 l
+363.395 540.02 l
+363.3 542.439 l
+363.632 544.668 l
+364.012 546.755 l
+364.343 548.984 l
+365.149 550.881 l
+366.098 552.825 l
+366.43 553.821 l
+366.857 554.912 l
+367.805 556.477 l
+368.849 558.137 l
+369.987 559.323 l
+371.457 560.793 l
+372.691 561.647 l
+373.876 562.643 l
+375.536 563.687 l
+377.339 564.398 l
+378.999 565.062 l
+380.469 565.299 l
+382.461 565.584 l
+384.074 565.536 l
+386.35 565.062 l
+388.105 565.062 l
+389.006 564.588 l
+390.002 564.256 l
+392.184 563.924 l
+394.176 562.975 l
+396.073 562.169 l
+397.78 560.936 l
+399.535 559.56 l
+401.622 558.327 l
+403.519 556.667 l
+405.416 554.96 l
+407.029 553.157 l
+409.069 551.213 l
+410.491 549.316 l
+411.961 546.944 l
+413.527 544.81 l
+414.807 542.533 l
+416.23 540.304 l
+417.274 537.744 l
h
f*
Q
q
2 j
-357.205 565.631 m
-417.155 565.631 l
-417.155 487.326 l
-357.205 487.326 l
+363.205 565.631 m
+423.155 565.631 l
+423.155 487.326 l
+363.205 487.326 l
h
n
Q
q
1.0 1.0 1.0 scn
2 j
-436.79 546.185 m
-437.976 543.34 l
-439.541 540.304 l
-441.154 537.648 l
-442.719 535.466 l
-444.663 532.953 l
-446.371 530.818 l
-448.601 528.4 l
-450.592 526.408 l
-451.778 525.317 l
-452.964 524.557 l
-454.149 523.277 l
-455.477 522.613 l
-456.521 521.807 l
-457.801 520.717 l
-458.702 520.242 l
-459.888 519.483 l
-462.354 518.534 l
-464.774 517.396 l
-467.24 516.448 l
-470.085 515.499 l
-471.413 515.167 l
-472.599 515.309 l
-473.974 514.977 l
-475.255 514.787 l
-476.488 514.74 l
-477.674 514.882 l
-478.86 514.977 l
-480.045 515.12 l
-481.373 514.788 l
-482.464 515.167 l
-483.602 515.309 l
-484.693 515.736 l
-485.832 515.831 l
-487.207 516.401 l
-488.25 516.78 l
-489.294 517.206 l
-490.812 517.823 l
-491.855 518.25 l
-492.661 518.914 l
-493.847 519.388 l
-494.796 520.1 l
-495.555 520.764 l
-496.455 521.617 l
-497.499 522.424 l
-498.448 523.135 l
-499.064 524.225 l
-499.918 525.127 l
-501.008 525.886 l
-501.625 526.976 l
-502.432 528.02 l
-503.143 529.158 l
-504.044 530.392 l
-505.04 532.716 l
-506.416 535.372 l
-507.506 537.885 l
-507.981 540.541 l
-508.503 543.15 l
-508.835 544.525 l
-509.167 545.853 l
-509.357 547.513 l
-509.214 548.699 l
-509.214 550.407 l
-509.594 551.64 l
-509.499 554.912 l
-509.119 558.042 l
-509.167 560.888 l
-508.313 563.828 l
-507.459 566.817 l
-506.843 569.71 l
-505.989 572.65 l
-504.709 575.828 l
-503.523 578.674 l
-502.005 581.188 l
-500.392 584.223 l
-498.78 586.547 l
-496.93 588.919 l
-494.985 591.479 l
-493.135 593.519 l
-490.954 595.464 l
-489.721 596.744 l
-488.441 597.788 l
-487.254 598.547 l
-486.211 599.353 l
-484.931 600.396 l
-483.887 600.823 l
-482.701 601.962 l
-481.658 602.388 l
-479.144 603.858 l
-476.678 604.76 l
-474.259 605.566 l
-471.603 606.088 l
-470.228 606.42 l
-468.947 606.61 l
-467.572 606.894 l
-466.244 607.226 l
-465.058 607.131 l
-463.682 607.463 l
-462.544 607.321 l
-461.358 607.226 l
-460.173 607.084 l
-459.129 606.704 l
-457.896 606.704 l
-456.806 606.278 l
-455.666 606.183 l
-454.292 605.661 l
-453.248 605.234 l
-452.205 604.807 l
-450.829 604.286 l
-449.739 603.479 l
-448.695 603.052 l
-447.794 602.72 l
-446.94 601.82 l
-445.565 600.918 l
-445.138 600.254 l
-443.762 599.353 l
-442.814 598.642 l
-441.96 597.74 l
-441.58 596.934 l
-440.632 596.223 l
-439.731 594.99 l
-439.019 593.804 l
-438.403 592.713 l
-437.597 591.67 l
-436.221 589.014 l
-435.131 586.5 l
-434.324 584.27 l
-433.518 581.52 l
-433.328 580.192 l
-432.901 578.674 l
-432.711 577.346 l
-432.332 576.16 l
-432.332 574.405 l
-432.047 573.077 l
-432.285 571.607 l
-431.953 570.232 l
-432.047 566.959 l
-432.142 563.687 l
-432.522 561.078 l
-433.186 558.185 l
-433.566 555.007 l
-434.751 552.161 l
-435.51 549.363 l
-436.79 546.185 l
+442.79 546.185 m
+443.976 543.34 l
+445.541 540.304 l
+447.154 537.648 l
+448.719 535.466 l
+450.663 532.953 l
+452.371 530.818 l
+454.601 528.4 l
+456.592 526.408 l
+457.778 525.317 l
+458.964 524.557 l
+460.149 523.277 l
+461.477 522.613 l
+462.521 521.807 l
+463.801 520.717 l
+464.702 520.242 l
+465.888 519.483 l
+468.354 518.534 l
+470.774 517.396 l
+473.24 516.448 l
+476.085 515.499 l
+477.413 515.167 l
+478.599 515.309 l
+479.974 514.977 l
+481.255 514.787 l
+482.488 514.74 l
+483.674 514.882 l
+484.86 514.977 l
+486.045 515.12 l
+487.373 514.788 l
+488.464 515.167 l
+489.602 515.309 l
+490.693 515.736 l
+491.832 515.831 l
+493.207 516.401 l
+494.25 516.78 l
+495.294 517.206 l
+496.812 517.823 l
+497.855 518.25 l
+498.661 518.914 l
+499.847 519.388 l
+500.796 520.1 l
+501.555 520.764 l
+502.455 521.617 l
+503.499 522.424 l
+504.448 523.135 l
+505.064 524.225 l
+505.918 525.127 l
+507.008 525.886 l
+507.625 526.976 l
+508.432 528.02 l
+509.143 529.158 l
+510.044 530.392 l
+511.04 532.716 l
+512.416 535.372 l
+513.506 537.885 l
+513.981 540.541 l
+514.503 543.15 l
+514.835 544.525 l
+515.167 545.853 l
+515.357 547.513 l
+515.214 548.699 l
+515.214 550.407 l
+515.594 551.64 l
+515.499 554.912 l
+515.119 558.042 l
+515.167 560.888 l
+514.313 563.828 l
+513.459 566.817 l
+512.843 569.71 l
+511.989 572.65 l
+510.709 575.828 l
+509.523 578.674 l
+508.005 581.188 l
+506.392 584.223 l
+504.78 586.547 l
+502.93 588.919 l
+500.985 591.479 l
+499.135 593.519 l
+496.954 595.464 l
+495.721 596.744 l
+494.441 597.788 l
+493.254 598.547 l
+492.211 599.353 l
+490.931 600.396 l
+489.887 600.823 l
+488.701 601.962 l
+487.658 602.388 l
+485.144 603.858 l
+482.678 604.76 l
+480.259 605.566 l
+477.603 606.088 l
+476.228 606.42 l
+474.947 606.61 l
+473.572 606.894 l
+472.244 607.226 l
+471.058 607.131 l
+469.682 607.463 l
+468.544 607.321 l
+467.358 607.226 l
+466.173 607.084 l
+465.129 606.704 l
+463.896 606.704 l
+462.806 606.278 l
+461.666 606.183 l
+460.292 605.661 l
+459.248 605.234 l
+458.205 604.807 l
+456.829 604.286 l
+455.739 603.479 l
+454.695 603.052 l
+453.794 602.72 l
+452.94 601.82 l
+451.565 600.918 l
+451.138 600.254 l
+449.762 599.353 l
+448.814 598.642 l
+447.96 597.74 l
+447.58 596.934 l
+446.632 596.223 l
+445.731 594.99 l
+445.019 593.804 l
+444.403 592.713 l
+443.597 591.67 l
+442.221 589.014 l
+441.131 586.5 l
+440.324 584.27 l
+439.518 581.52 l
+439.328 580.192 l
+438.901 578.674 l
+438.711 577.346 l
+438.332 576.16 l
+438.332 574.405 l
+438.047 573.077 l
+438.285 571.607 l
+437.953 570.232 l
+438.047 566.959 l
+438.142 563.687 l
+438.522 561.078 l
+439.186 558.185 l
+439.566 555.007 l
+440.751 552.161 l
+441.51 549.363 l
+442.79 546.185 l
h
f*
Q
q
2 j
-431.905 607.463 m
-509.688 607.463 l
-509.688 514.693 l
-431.905 514.693 l
+437.905 607.463 m
+515.688 607.463 l
+515.688 514.693 l
+437.905 514.693 l
h
n
Q
q
2 j
-454.67 547.134 m
-455.382 545.332 l
-455.952 543.956 l
-456.662 542.154 l
-457.517 540.921 l
-458.56 539.593 l
-459.651 538.123 l
-460.505 536.889 l
-461.405 535.514 l
-462.686 534.47 l
-463.398 533.522 l
-464.773 532.289 l
-465.864 531.719 l
-467.05 530.961 l
-468.093 530.107 l
-469.326 529.206 l
-470.607 529.016 l
-471.935 528.684 l
-472.931 528.4 l
-474.164 527.973 l
-475.16 528.068 l
-475.919 527.973 l
-476.204 528.115 l
-476.962 528.4 l
-477.437 528.068 l
-477.911 528.258 l
-478.481 528.494 l
-479.713 528.969 l
-480.614 529.301 l
-481.658 529.728 l
-482.701 530.676 l
-483.176 531.198 l
-484.124 531.909 l
-484.836 533.095 l
-485.594 534.233 l
-486.116 535.134 l
-486.875 536.32 l
-487.065 537.6 l
-487.681 539.071 l
-488.013 540.447 l
-488.203 541.727 l
-488.393 543.529 l
-488.298 544.573 l
-488.488 546.375 l
-488.345 548.415 l
-488.25 549.932 l
-488.013 551.402 l
-487.729 553.015 l
-487.492 554.485 l
-486.78 556.288 l
-486.685 557.853 l
-486.021 559.513 l
-485.31 561.315 l
-484.788 562.643 l
-483.602 564.303 l
-483.081 565.631 l
-482.085 566.817 l
-481.184 568.192 l
-480.33 569.425 l
-479.334 570.611 l
-478.433 571.987 l
-477.153 573.077 l
-475.872 574.121 l
-474.781 575.069 l
-473.595 575.829 l
-472.505 576.445 l
-471.603 576.967 l
-469.943 577.536 l
-469.042 578.058 l
-467.714 578.39 l
-466.386 578.58 l
-465.532 578.58 l
-464.773 578.295 l
-464.299 578.627 l
-464.014 578.484 l
-463.114 578.484 l
-462.07 578.104 l
-461.026 577.678 l
-459.936 577.251 l
-459.034 576.54 l
-457.991 576.113 l
-457.374 575.354 l
-456.616 574.737 l
-455.856 573.552 l
-455.382 572.508 l
-454.576 571.465 l
-453.96 569.995 l
-453.485 568.951 l
-453.011 567.528 l
-452.679 566.2 l
-452.489 564.92 l
-452.109 563.212 l
-452.062 561.6 l
-452.347 559.987 l
-452.157 558.327 l
-452.394 556.857 l
-452.679 555.244 l
-452.774 553.679 l
-453.201 551.782 l
-453.722 550.407 l
-454.149 548.509 l
-454.671 547.134 l
+460.67 547.134 m
+461.382 545.332 l
+461.952 543.956 l
+462.662 542.154 l
+463.517 540.921 l
+464.56 539.593 l
+465.651 538.123 l
+466.505 536.889 l
+467.405 535.514 l
+468.686 534.47 l
+469.398 533.522 l
+470.773 532.289 l
+471.864 531.719 l
+473.05 530.961 l
+474.093 530.107 l
+475.326 529.206 l
+476.607 529.016 l
+477.935 528.684 l
+478.931 528.4 l
+480.164 527.973 l
+481.16 528.068 l
+481.919 527.973 l
+482.204 528.115 l
+482.962 528.4 l
+483.437 528.068 l
+483.911 528.258 l
+484.481 528.494 l
+485.713 528.969 l
+486.614 529.301 l
+487.658 529.728 l
+488.701 530.676 l
+489.176 531.198 l
+490.124 531.909 l
+490.836 533.095 l
+491.594 534.233 l
+492.116 535.134 l
+492.875 536.32 l
+493.065 537.6 l
+493.681 539.071 l
+494.013 540.447 l
+494.203 541.727 l
+494.393 543.529 l
+494.298 544.573 l
+494.488 546.375 l
+494.345 548.415 l
+494.25 549.932 l
+494.013 551.402 l
+493.729 553.015 l
+493.492 554.485 l
+492.78 556.288 l
+492.685 557.853 l
+492.021 559.513 l
+491.31 561.315 l
+490.788 562.643 l
+489.602 564.303 l
+489.081 565.631 l
+488.085 566.817 l
+487.184 568.192 l
+486.33 569.425 l
+485.334 570.611 l
+484.433 571.987 l
+483.153 573.077 l
+481.872 574.121 l
+480.781 575.069 l
+479.595 575.829 l
+478.505 576.445 l
+477.603 576.967 l
+475.943 577.536 l
+475.042 578.058 l
+473.714 578.39 l
+472.386 578.58 l
+471.532 578.58 l
+470.773 578.295 l
+470.299 578.627 l
+470.014 578.484 l
+469.114 578.484 l
+468.07 578.104 l
+467.026 577.678 l
+465.936 577.251 l
+465.034 576.54 l
+463.991 576.113 l
+463.374 575.354 l
+462.616 574.737 l
+461.856 573.552 l
+461.382 572.508 l
+460.576 571.465 l
+459.96 569.995 l
+459.485 568.951 l
+459.011 567.528 l
+458.679 566.2 l
+458.489 564.92 l
+458.109 563.212 l
+458.062 561.6 l
+458.347 559.987 l
+458.157 558.327 l
+458.394 556.857 l
+458.679 555.244 l
+458.774 553.679 l
+459.201 551.782 l
+459.722 550.407 l
+460.149 548.509 l
+460.671 547.134 l
h
f*
Q
q
2 j
-452.062 578.627 m
-488.535 578.627 l
-488.535 527.925 l
-452.062 527.925 l
+458.062 578.627 m
+494.535 578.627 l
+494.535 527.925 l
+458.062 527.925 l
h
n
Q
q
2 j
-400.223 524.985 m
-400.792 523.609 l
-401.408 522.139 l
-401.978 520.764 l
-402.357 519.862 l
-402.831 518.297 l
-402.926 517.159 l
-403.496 515.784 l
-403.496 514.598 l
-403.78 512.938 l
-403.922 511.8 l
-403.827 510.709 l
-404.064 509.381 l
-404.159 508.242 l
-403.969 507.436 l
-403.779 506.156 l
-403.211 505.065 l
-403.211 504.211 l
-402.831 503.357 l
-402.262 502.598 l
-402.12 502.172 l
-401.788 501.697 l
-401.456 501.602 l
-401.598 501.318 l
-400.839 500.986 l
-400.744 500.416 l
-400.27 500.274 l
-399.986 500.132 l
-399.654 500.037 l
-399.511 499.61 l
-399.037 499.42 l
-398.752 499.278 l
-398.42 499.184 l
-397.994 498.994 l
-397.567 499.184 l
-397.282 499.041 l
-396.808 498.899 l
-396.523 498.757 l
-395.859 499.041 l
-395.575 498.899 l
-394.389 498.804 l
-393.678 498.852 l
-392.587 499.326 l
-391.543 499.753 l
-390.69 500.133 l
-389.93 500.701 l
-389.077 501.081 l
-387.891 501.792 l
-387.275 502.456 l
-386.231 503.262 l
-385.378 504.116 l
-384.05 505.16 l
-383.243 506.25 l
-382.579 507.057 l
-381.679 508.432 l
-380.777 509.286 l
-380.207 510.614 l
-379.354 511.847 l
-378.88 513.08 l
-378.026 514.313 l
-377.457 515.641 l
-376.84 517.159 l
-376.461 518.013 l
-375.844 519.53 l
-375.892 520.764 l
-375.322 522.092 l
-375.18 523.277 l
-374.848 524.89 l
-374.896 526.123 l
-374.801 527.119 l
-374.848 528.352 l
-374.658 529.68 l
-375.133 530.581 l
-375.038 531.72 l
-375.465 532.81 l
-375.987 533.664 l
-375.987 534.565 l
-376.414 535.609 l
-376.698 535.704 l
-376.888 536.13 l
-377.22 536.605 l
-377.504 536.747 l
-377.836 536.842 l
-377.931 537.412 l
-378.406 537.601 l
-378.832 537.791 l
-379.022 538.17 l
-379.307 538.312 l
-380.066 538.597 l
-380.398 538.739 l
-381.109 539.024 l
-381.441 539.166 l
-381.868 538.976 l
-382.152 539.071 l
-382.627 539.261 l
-383.054 539.451 l
-383.528 539.119 l
-384.287 539.024 l
-385.14 539.024 l
-386.042 538.549 l
-386.99 538.359 l
-388.128 537.79 l
-389.172 537.316 l
-390.026 536.984 l
-390.832 535.894 l
-391.828 535.561 l
-392.587 534.661 l
-393.772 533.901 l
-394.532 532.811 l
-395.432 531.577 l
-396.286 530.724 l
-397.14 529.49 l
-397.899 528.542 l
-398.895 527.404 l
-399.322 526.36 l
-400.222 524.985 l
+406.223 524.985 m
+406.792 523.609 l
+407.408 522.139 l
+407.978 520.764 l
+408.357 519.862 l
+408.831 518.297 l
+408.926 517.159 l
+409.496 515.784 l
+409.496 514.598 l
+409.78 512.938 l
+409.922 511.8 l
+409.827 510.709 l
+410.064 509.381 l
+410.159 508.242 l
+409.969 507.436 l
+409.779 506.156 l
+409.211 505.065 l
+409.211 504.211 l
+408.831 503.357 l
+408.262 502.598 l
+408.12 502.172 l
+407.788 501.697 l
+407.456 501.602 l
+407.598 501.318 l
+406.839 500.986 l
+406.744 500.416 l
+406.27 500.274 l
+405.986 500.132 l
+405.654 500.037 l
+405.511 499.61 l
+405.037 499.42 l
+404.752 499.278 l
+404.42 499.184 l
+403.994 498.994 l
+403.567 499.184 l
+403.282 499.041 l
+402.808 498.899 l
+402.523 498.757 l
+401.859 499.041 l
+401.575 498.899 l
+400.389 498.804 l
+399.678 498.852 l
+398.587 499.326 l
+397.543 499.753 l
+396.69 500.133 l
+395.93 500.701 l
+395.077 501.081 l
+393.891 501.792 l
+393.275 502.456 l
+392.231 503.262 l
+391.378 504.116 l
+390.05 505.16 l
+389.243 506.25 l
+388.579 507.057 l
+387.679 508.432 l
+386.777 509.286 l
+386.207 510.614 l
+385.354 511.847 l
+384.88 513.08 l
+384.026 514.313 l
+383.457 515.641 l
+382.84 517.159 l
+382.461 518.013 l
+381.844 519.53 l
+381.892 520.764 l
+381.322 522.092 l
+381.18 523.277 l
+380.848 524.89 l
+380.896 526.123 l
+380.801 527.119 l
+380.848 528.352 l
+380.658 529.68 l
+381.133 530.581 l
+381.038 531.72 l
+381.465 532.81 l
+381.987 533.664 l
+381.987 534.565 l
+382.414 535.609 l
+382.698 535.704 l
+382.888 536.13 l
+383.22 536.605 l
+383.504 536.747 l
+383.836 536.842 l
+383.931 537.412 l
+384.406 537.601 l
+384.832 537.791 l
+385.022 538.17 l
+385.307 538.312 l
+386.066 538.597 l
+386.398 538.739 l
+387.109 539.024 l
+387.441 539.166 l
+387.868 538.976 l
+388.152 539.071 l
+388.627 539.261 l
+389.054 539.451 l
+389.528 539.119 l
+390.287 539.024 l
+391.14 539.024 l
+392.042 538.549 l
+392.99 538.359 l
+394.128 537.79 l
+395.172 537.316 l
+396.026 536.984 l
+396.832 535.894 l
+397.828 535.561 l
+398.587 534.661 l
+399.772 533.901 l
+400.532 532.811 l
+401.432 531.577 l
+402.286 530.724 l
+403.14 529.49 l
+403.899 528.542 l
+404.895 527.404 l
+405.322 526.36 l
+406.222 524.985 l
h
f*
Q
q
2 j
-374.611 539.45 m
-404.254 539.45 l
-404.254 498.71 l
-374.611 498.71 l
+380.611 539.45 m
+410.254 539.45 l
+410.254 498.71 l
+380.611 498.71 l
h
n
Q
q
1.0 0.82745 0.12549 scn
2 j
-396.476 497.855 m
-396.666 499.184 l
-397.282 500.654 l
-398.088 501.65 l
-398.99 503.784 l
-399.654 505.254 l
-400.46 507.152 l
-401.361 508.764 l
-402.784 510.519 l
-403.59 512.416 l
-404.966 514.218 l
-406.009 516.4 l
-407.384 518.155 l
-409.092 520.052 l
-410.752 521.949 l
-412.459 523.846 l
-414.594 525.459 l
-416.538 527.119 l
-418.673 528.826 l
-421.233 530.202 l
-422.562 531.292 l
-423.462 531.625 l
-424.838 532.525 l
-426.214 533.095 l
-427.684 533.712 l
-429.059 534.233 l
-430.719 534.897 l
-432.332 535.182 l
-433.707 535.752 l
-435.652 536.036 l
-437.454 536.747 l
-438.924 536.984 l
-440.964 537.126 l
-442.814 537.316 l
-444.758 537.743 l
-446.845 537.743 l
-448.79 537.648 l
-450.545 537.648 l
-452.821 537.696 l
-454.861 537.838 l
-457.137 537.316 l
-459.604 537.269 l
-461.548 537.174 l
-464.346 536.747 l
-466.766 536.32 l
-469.136 535.704 l
-470.702 535.656 l
-472.931 535.324 l
-474.733 535.182 l
-476.393 534.992 l
-478.433 535.087 l
-480.093 534.897 l
-481.848 535.277 l
-483.65 535.087 l
-485.547 535.182 l
-488.108 535.324 l
-490.053 535.229 l
-492.424 535.466 l
-493.942 535.561 l
-495.128 535.704 l
-496.456 535.894 l
-498.068 535.704 l
-499.538 535.941 l
-500.914 535.609 l
-502.384 535.846 l
-504.187 535.704 l
-506.273 535.656 l
-507.412 535.419 l
-509.262 535.277 l
-510.827 535.229 l
-512.06 535.182 l
-513.53 534.565 l
-514.81 534.375 l
-516.186 534.044 l
-517.229 533.617 l
-518.652 533.142 l
-519.601 532.478 l
-520.597 532.194 l
-521.783 531.435 l
-522.826 530.961 l
-523.49 530.201 l
-524.58 529.253 l
-525.245 528.826 l
-525.956 527.878 l
-526.573 527.261 l
-527.474 526.361 l
-527.854 525.317 l
-528.612 524.416 l
-528.849 523.799 l
-529.276 522.756 l
-529.751 521.522 l
-530.083 520.622 l
-530.509 519.578 l
-530.509 518.724 l
-530.936 517.634 l
-530.889 516.4 l
-531.031 515.262 l
-531.126 514.076 l
-531.268 512.89 l
-531.126 511.942 l
-530.936 510.662 l
-530.889 509.428 l
-530.415 506.772 l
-530.083 504.543 l
-529.087 502.219 l
-527.996 499.705 l
-527.047 496.859 l
-525.577 494.346 l
-524.107 492.022 l
-522.637 489.508 l
-520.834 487.042 l
-518.51 484.528 l
-516.66 482.204 l
-514.431 479.548 l
-511.681 477.224 l
-509.404 475.09 l
-508.076 474.046 l
-507.412 473.05 l
-506.084 472.007 l
-504.993 470.869 l
-503.76 469.493 l
-502.669 468.355 l
-500.961 465.557 l
-498.685 463.09 l
-496.693 459.675 l
-494.653 456.925 l
-492.234 453.842 l
-491.049 452.466 l
-490.053 451.043 l
-488.535 449.573 l
-487.16 448.15 l
-485.832 446.727 l
-484.266 445.399 l
-482.749 443.929 l
-481.184 442.601 l
-479.429 441.368 l
-477.911 439.85 l
-475.966 438.712 l
-473.832 437.858 l
-471.935 436.578 l
-469.374 435.534 l
-467.429 434.775 l
-464.869 433.732 l
-462.734 432.878 l
-460.789 432.594 l
-458.987 432.262 l
-457.09 431.835 l
-455.24 431.598 l
-453.296 431.171 l
-451.683 431.361 l
-449.928 431.361 l
-448.268 431.598 l
-446.608 431.788 l
-444.853 431.788 l
-443.525 432.119 l
-441.913 432.167 l
-440.585 432.499 l
-437.739 433.447 l
-434.371 434.538 l
-431.715 435.392 l
-426.261 437.763 l
-423.511 438.57 l
-420.38 439.376 l
-417.392 440.277 l
-415.827 440.324 l
-414.451 440.656 l
-411.463 441.178 l
-409.092 441.842 l
-406.578 442.032 l
-404.396 442.743 l
-402.025 443.36 l
-399.701 443.976 l
-397.756 444.925 l
-395.717 445.684 l
-394.247 446.68 l
-392.16 447.581 l
-390.88 448.624 l
-389.267 449.573 l
-388.081 450.806 l
-386.753 451.85 l
-385.425 453.083 l
-384.287 454.173 l
-383.291 455.359 l
-382.674 456.877 l
-381.868 458.11 l
-381.298 459.438 l
-380.682 460.956 l
-380.445 462.426 l
-380.065 463.47 l
-379.971 465.035 l
-380.113 466.315 l
-379.876 467.785 l
-380.16 469.303 l
-380.777 470.773 l
-381.204 471.959 l
-381.82 473.429 l
-382.39 475.089 l
-383.196 476.086 l
-383.812 477.603 l
-384.761 479.169 l
-385.52 480.354 l
-386.279 481.54 l
-387.085 482.536 l
-387.844 483.722 l
-388.318 484.622 l
-389.077 485.809 l
-389.409 486.805 l
-390.026 487.421 l
-390.784 488.607 l
-391.259 489.508 l
-391.401 490.078 l
-392.35 490.788 l
-392.492 491.215 l
-392.966 492.259 l
-393.725 493.445 l
-394.152 494.488 l
-395.1 495.199 l
-395.48 496.053 l
-395.575 496.623 l
-395.907 497.144 l
-396.191 497.761 l
-396.476 497.855 l
+402.476 497.855 m
+402.666 499.184 l
+403.282 500.654 l
+404.088 501.65 l
+404.99 503.784 l
+405.654 505.254 l
+406.46 507.152 l
+407.361 508.764 l
+408.784 510.519 l
+409.59 512.416 l
+410.966 514.218 l
+412.009 516.4 l
+413.384 518.155 l
+415.092 520.052 l
+416.752 521.949 l
+418.459 523.846 l
+420.594 525.459 l
+422.538 527.119 l
+424.673 528.826 l
+427.233 530.202 l
+428.562 531.292 l
+429.462 531.625 l
+430.838 532.525 l
+432.214 533.095 l
+433.684 533.712 l
+435.059 534.233 l
+436.719 534.897 l
+438.332 535.182 l
+439.707 535.752 l
+441.652 536.036 l
+443.454 536.747 l
+444.924 536.984 l
+446.964 537.126 l
+448.814 537.316 l
+450.758 537.743 l
+452.845 537.743 l
+454.79 537.648 l
+456.545 537.648 l
+458.821 537.696 l
+460.861 537.838 l
+463.137 537.316 l
+465.604 537.269 l
+467.548 537.174 l
+470.346 536.747 l
+472.766 536.32 l
+475.136 535.704 l
+476.702 535.656 l
+478.931 535.324 l
+480.733 535.182 l
+482.393 534.992 l
+484.433 535.087 l
+486.093 534.897 l
+487.848 535.277 l
+489.65 535.087 l
+491.547 535.182 l
+494.108 535.324 l
+496.053 535.229 l
+498.424 535.466 l
+499.942 535.561 l
+501.128 535.704 l
+502.456 535.894 l
+504.068 535.704 l
+505.538 535.941 l
+506.914 535.609 l
+508.384 535.846 l
+510.187 535.704 l
+512.273 535.656 l
+513.412 535.419 l
+515.262 535.277 l
+516.827 535.229 l
+518.06 535.182 l
+519.53 534.565 l
+520.81 534.375 l
+522.186 534.044 l
+523.229 533.617 l
+524.652 533.142 l
+525.601 532.478 l
+526.597 532.194 l
+527.783 531.435 l
+528.826 530.961 l
+529.49 530.201 l
+530.58 529.253 l
+531.245 528.826 l
+531.956 527.878 l
+532.573 527.261 l
+533.474 526.361 l
+533.854 525.317 l
+534.612 524.416 l
+534.849 523.799 l
+535.276 522.756 l
+535.751 521.522 l
+536.083 520.622 l
+536.509 519.578 l
+536.509 518.724 l
+536.936 517.634 l
+536.889 516.4 l
+537.031 515.262 l
+537.126 514.076 l
+537.268 512.89 l
+537.126 511.942 l
+536.936 510.662 l
+536.889 509.428 l
+536.415 506.772 l
+536.083 504.543 l
+535.087 502.219 l
+533.996 499.705 l
+533.047 496.859 l
+531.577 494.346 l
+530.107 492.022 l
+528.637 489.508 l
+526.834 487.042 l
+524.51 484.528 l
+522.66 482.204 l
+520.431 479.548 l
+517.681 477.224 l
+515.404 475.09 l
+514.076 474.046 l
+513.412 473.05 l
+512.084 472.007 l
+510.993 470.869 l
+509.76 469.493 l
+508.669 468.355 l
+506.961 465.557 l
+504.685 463.09 l
+502.693 459.675 l
+500.653 456.925 l
+498.234 453.842 l
+497.049 452.466 l
+496.053 451.043 l
+494.535 449.573 l
+493.16 448.15 l
+491.832 446.727 l
+490.266 445.399 l
+488.749 443.929 l
+487.184 442.601 l
+485.429 441.368 l
+483.911 439.85 l
+481.966 438.712 l
+479.832 437.858 l
+477.935 436.578 l
+475.374 435.534 l
+473.429 434.775 l
+470.869 433.732 l
+468.734 432.878 l
+466.789 432.594 l
+464.987 432.262 l
+463.09 431.835 l
+461.24 431.598 l
+459.296 431.171 l
+457.683 431.361 l
+455.928 431.361 l
+454.268 431.598 l
+452.608 431.788 l
+450.853 431.788 l
+449.525 432.119 l
+447.913 432.167 l
+446.585 432.499 l
+443.739 433.447 l
+440.371 434.538 l
+437.715 435.392 l
+432.261 437.763 l
+429.511 438.57 l
+426.38 439.376 l
+423.392 440.277 l
+421.827 440.324 l
+420.451 440.656 l
+417.463 441.178 l
+415.092 441.842 l
+412.578 442.032 l
+410.396 442.743 l
+408.025 443.36 l
+405.701 443.976 l
+403.756 444.925 l
+401.717 445.684 l
+400.247 446.68 l
+398.16 447.581 l
+396.88 448.624 l
+395.267 449.573 l
+394.081 450.806 l
+392.753 451.85 l
+391.425 453.083 l
+390.287 454.173 l
+389.291 455.359 l
+388.674 456.877 l
+387.868 458.11 l
+387.298 459.438 l
+386.682 460.956 l
+386.445 462.426 l
+386.065 463.47 l
+385.971 465.035 l
+386.113 466.315 l
+385.876 467.785 l
+386.16 469.303 l
+386.777 470.773 l
+387.204 471.959 l
+387.82 473.429 l
+388.39 475.089 l
+389.196 476.086 l
+389.812 477.603 l
+390.761 479.169 l
+391.52 480.354 l
+392.279 481.54 l
+393.085 482.536 l
+393.844 483.722 l
+394.318 484.622 l
+395.077 485.809 l
+395.409 486.805 l
+396.026 487.421 l
+396.784 488.607 l
+397.259 489.508 l
+397.401 490.078 l
+398.35 490.788 l
+398.492 491.215 l
+398.966 492.259 l
+399.725 493.445 l
+400.152 494.488 l
+401.1 495.199 l
+401.48 496.053 l
+401.575 496.623 l
+401.907 497.144 l
+402.191 497.761 l
+402.476 497.855 l
h
f*
Q
q
2 j
-379.876 537.838 m
-531.316 537.838 l
-531.316 431.123 l
-379.876 431.123 l
+385.876 537.838 m
+537.316 537.838 l
+537.316 431.123 l
+385.876 431.123 l
h
n
Q
q
0.90196 0.54902 0.24706 scn
2 j
-513.435 514.456 m
-512.819 514.218 l
-512.059 513.886 l
-511.775 513.792 l
-511.159 513.175 l
-510.399 512.89 l
-509.783 512.274 l
-508.597 511.278 l
-507.459 510.14 l
-506.084 508.337 l
-504.898 506.962 l
-503.665 505.254 l
-490.717 488.654 l
-486.875 483.817 l
-483.033 479.453 l
-479.002 475.043 l
-474.638 470.631 l
-472.172 468.592 l
-469.753 466.742 l
-467.193 464.845 l
-464.963 463.043 l
-462.497 461.335 l
-459.793 459.77 l
-457.09 458.3 l
-454.197 457.162 l
-451.493 456.071 l
-448.458 455.359 l
-445.659 454.553 l
-443.003 454.173 l
-439.873 453.794 l
-437.027 453.51 l
-434.324 453.272 l
-431.858 453.367 l
-429.344 453.557 l
-426.451 453.794 l
-424.221 454.126 l
-421.613 454.6 l
-416.87 455.502 l
-412.46 456.545 l
-408.19 458.11 l
-404.302 459.533 l
-397.709 461.715 l
-396.429 462.284 l
-395.812 462.521 l
-395.385 462.711 l
-394.531 463.091 l
-393.915 463.327 l
-393.298 463.612 l
-392.587 463.659 l
-392.16 463.849 l
-391.686 463.659 l
-391.401 463.565 l
-390.879 464.893 l
-390.31 466.268 l
-390.642 466.41 l
-391.069 466.553 l
-391.401 466.695 l
-391.496 466.41 l
-391.78 466.505 l
-392.255 466.695 l
-392.207 466.315 l
-392.682 466.505 l
-393.108 466.695 l
-393.535 466.505 l
-394.01 466.173 l
-394.436 465.983 l
-395.006 465.889 l
-396.381 465.557 l
-398.705 464.418 l
-405.487 461.905 l
-409.139 460.577 l
-413.313 459.296 l
-417.392 458.158 l
-422.277 457.351 l
-424.317 456.924 l
-427.162 456.355 l
-429.392 456.545 l
-432.047 456.403 l
-434.419 456.118 l
-436.79 456.213 l
-439.494 456.45 l
-442.292 456.877 l
-444.806 457.541 l
-447.414 458.063 l
-450.402 458.917 l
-453.248 460.055 l
-455.62 461.051 l
-458.37 462.474 l
-460.6 463.897 l
-463.35 465.367 l
-465.817 467.074 l
-468.046 468.829 l
-470.465 470.679 l
-472.599 472.766 l
-477.009 477.034 l
-481.041 481.445 l
-484.836 485.951 l
-488.536 490.219 l
-501.293 507.294 l
-502.574 508.859 l
-504.092 510.329 l
-505.467 512.132 l
-506.985 513.602 l
-507.554 513.839 l
-508.218 514.456 l
-508.692 514.977 l
-509.262 515.737 l
-510.305 516.163 l
-511.064 516.448 l
-511.254 516.874 l
-512.297 517.301 l
-512.819 515.973 l
-513.435 514.456 l
+519.435 514.456 m
+518.819 514.218 l
+518.059 513.886 l
+517.775 513.792 l
+517.159 513.175 l
+516.399 512.89 l
+515.783 512.274 l
+514.597 511.278 l
+513.459 510.14 l
+512.084 508.337 l
+510.898 506.962 l
+509.665 505.254 l
+496.717 488.654 l
+492.875 483.817 l
+489.033 479.453 l
+485.002 475.043 l
+480.638 470.631 l
+478.172 468.592 l
+475.753 466.742 l
+473.193 464.845 l
+470.963 463.043 l
+468.497 461.335 l
+465.793 459.77 l
+463.09 458.3 l
+460.197 457.162 l
+457.493 456.071 l
+454.458 455.359 l
+451.659 454.553 l
+449.003 454.173 l
+445.873 453.794 l
+443.027 453.51 l
+440.324 453.272 l
+437.858 453.367 l
+435.344 453.557 l
+432.451 453.794 l
+430.221 454.126 l
+427.613 454.6 l
+422.87 455.502 l
+418.46 456.545 l
+414.19 458.11 l
+410.302 459.533 l
+403.709 461.715 l
+402.429 462.284 l
+401.812 462.521 l
+401.385 462.711 l
+400.531 463.091 l
+399.915 463.327 l
+399.298 463.612 l
+398.587 463.659 l
+398.16 463.849 l
+397.686 463.659 l
+397.401 463.565 l
+396.879 464.893 l
+396.31 466.268 l
+396.642 466.41 l
+397.069 466.553 l
+397.401 466.695 l
+397.496 466.41 l
+397.78 466.505 l
+398.255 466.695 l
+398.207 466.315 l
+398.682 466.505 l
+399.108 466.695 l
+399.535 466.505 l
+400.01 466.173 l
+400.436 465.983 l
+401.006 465.889 l
+402.381 465.557 l
+404.705 464.418 l
+411.487 461.905 l
+415.139 460.577 l
+419.313 459.296 l
+423.392 458.158 l
+428.277 457.351 l
+430.317 456.924 l
+433.162 456.355 l
+435.392 456.545 l
+438.047 456.403 l
+440.419 456.118 l
+442.79 456.213 l
+445.494 456.45 l
+448.292 456.877 l
+450.806 457.541 l
+453.414 458.063 l
+456.402 458.917 l
+459.248 460.055 l
+461.62 461.051 l
+464.37 462.474 l
+466.6 463.897 l
+469.35 465.367 l
+471.817 467.074 l
+474.046 468.829 l
+476.465 470.679 l
+478.599 472.766 l
+483.009 477.034 l
+487.041 481.445 l
+490.836 485.951 l
+494.536 490.219 l
+507.293 507.294 l
+508.574 508.859 l
+510.092 510.329 l
+511.467 512.132 l
+512.985 513.602 l
+513.554 513.839 l
+514.218 514.456 l
+514.692 514.977 l
+515.262 515.737 l
+516.305 516.163 l
+517.064 516.448 l
+517.254 516.874 l
+518.297 517.301 l
+518.819 515.973 l
+519.435 514.456 l
h
f*
Q
q
2 j
-390.31 517.349 m
-513.483 517.349 l
-513.483 453.225 l
-390.31 453.225 l
+396.31 517.349 m
+519.483 517.349 l
+519.483 453.225 l
+396.31 453.225 l
h
n
Q
@@ -1330,28 +1330,28 @@ xref
0 19
0000000000 65535 f
0000000015 00000 n
-0000000248 00000 n
-0000000449 00000 n
-0000000506 00000 n
-0000000557 00000 n
-0000000829 00000 n
-0000020642 00000 n
-0000020938 00000 n
-0000021102 00000 n
-0000021175 00000 n
-0000021299 00000 n
-0000021344 00000 n
-0000021387 00000 n
-0000021436 00000 n
-0000021489 00000 n
-0000027852 00000 n
-0000028064 00000 n
-0000029418 00000 n
+0000000240 00000 n
+0000000441 00000 n
+0000000498 00000 n
+0000000549 00000 n
+0000000821 00000 n
+0000020635 00000 n
+0000020931 00000 n
+0000021095 00000 n
+0000021168 00000 n
+0000021292 00000 n
+0000021337 00000 n
+0000021380 00000 n
+0000021429 00000 n
+0000021482 00000 n
+0000027845 00000 n
+0000028057 00000 n
+0000029411 00000 n
trailer
<< /Size 19
/Root 2 0 R
/Info 1 0 R
>>
startxref
-30332
+30325
%%EOF