diff --git a/resume/README.md b/resume/README.md
index 8b03b56..78c2208 100644
--- a/resume/README.md
+++ b/resume/README.md
@@ -1,6 +1,6 @@
# Resume · 团队简历模板
-GreLin 双栏中文简历 Typst 模板(HyperLabel 配色),用于融资 BP data room 附录。
+GreLin 双栏中文简历 Typst 模板,用于融资 BP data room 附录。
## 照片
@@ -25,16 +25,17 @@ GreLin 双栏中文简历 Typst 模板(HyperLabel 配色),用于融资 BP
)
#let skills = (
- abilities: (
- (name: "全栈开发", level: 0.9),
- ),
- language: (
- name: "英语",
- level: 0.75,
- label: "读写",
- ),
tags: ("Rust", "Python"),
notes: (), // 可选:侧栏技能补充列表
+ // 可选:能力进度条(有数据时自动显示「能力」子区块)
+ // abilities: (
+ // (name: "全栈开发", level: 0.9),
+ // ),
+ // language: (
+ // name: "英语",
+ // level: 0.75,
+ // label: "读写",
+ // ),
)
#let education = (
diff --git a/resume/assets/icons/globe.svg b/resume/assets/icons/globe.svg
index d235346..7681118 100644
--- a/resume/assets/icons/globe.svg
+++ b/resume/assets/icons/globe.svg
@@ -1 +1 @@
-
+
diff --git a/resume/assets/icons/mail.svg b/resume/assets/icons/mail.svg
index 12e9ce0..341afbe 100644
--- a/resume/assets/icons/mail.svg
+++ b/resume/assets/icons/mail.svg
@@ -1 +1 @@
-
+
diff --git a/resume/assets/icons/map-pin.svg b/resume/assets/icons/map-pin.svg
index bad211e..6c85e3f 100644
--- a/resume/assets/icons/map-pin.svg
+++ b/resume/assets/icons/map-pin.svg
@@ -1 +1 @@
-
+
diff --git a/resume/assets/icons/phone.svg b/resume/assets/icons/phone.svg
index 94dcdb1..d265264 100644
--- a/resume/assets/icons/phone.svg
+++ b/resume/assets/icons/phone.svg
@@ -1 +1 @@
-
+
diff --git a/resume/data/config.typ b/resume/data/config.typ
index bd67ae0..0bab1fe 100644
--- a/resume/data/config.typ
+++ b/resume/data/config.typ
@@ -22,15 +22,6 @@
)
#let skills = (
- abilities: (
- (name: "全栈开发", level: 0.9),
- (name: "系统架构", level: 0.75),
- ),
- language: (
- name: "英语",
- level: 0.75,
- label: "读写",
- ),
tags: (
"Rust", "Python", "Java", "React", "Tauri", "RAG", "Linux", "MySQL", "Redis",
"LLM Agent",
diff --git a/resume/data/layout.typ b/resume/data/layout.typ
index a144f60..856a0aa 100644
--- a/resume/data/layout.typ
+++ b/resume/data/layout.typ
@@ -82,9 +82,15 @@
} else if sidebar {
space-none
} else {
- space-block
+ space-main-section
+ }
+ let title-below = if below != auto {
+ below
+ } else if sidebar {
+ space-title-gap
+ } else {
+ space-main-title-below
}
- let title-below = if below != auto { below } else { space-title-gap }
block(width: 100%, above: title-above, below: title-below)[
#text(font: heading-font, size: size-heading, weight: "bold", fill: color-ink)[#title]
#if divider [
@@ -121,7 +127,7 @@
/// 教育背景条目(notes 可选,一段普通正文)
#let edu-entry(degree, school, period, location, notes: "") = block(above: space-none, below: space-none)[
#text(fill: color-body, size: size-body)[#degree]
- #v(space-inline)
+ #v(space-edu-meta-gap)
#text(fill: color-text-light, size: size-secondary)[
#school#if period != "" [ · #period]#if location != "" [ · #location]
]
@@ -174,7 +180,7 @@
]
}
-/// 技能进度条(level: 0–1);条与条之间仅用 above 控制间距
+/// 技能进度条(level: 0–1);config 提供 abilities / language 时由 abilities-block 渲染
#let skill-bar(name, level, subtitle: none, above: space-none) = block(above: above, below: space-none)[
#if subtitle != none [
#grid(
@@ -193,6 +199,41 @@
]
]
+#let has-abilities-section() = {
+ let ability-list = skills.at("abilities", default: ())
+ let has-lang = skills.at("language", default: none) != none
+ ability-list.len() > 0 or has-lang
+}
+
+/// 「能力」进度条区块(skills.abilities / skills.language 有数据时才显示)
+#let abilities-block() = {
+ if has-abilities-section() {
+ sidebar-subtitle("能力", above: space-none)
+ block(below: space-none)[
+ #for (i, item) in skills.at("abilities", default: ()).enumerate() {
+ skill-bar(
+ item.name,
+ item.level,
+ above: if i == 0 { space-none } else { space-skill-gap },
+ )
+ }
+ #let lang = skills.at("language", default: none)
+ #if lang != none {
+ skill-bar(
+ lang.name,
+ lang.level,
+ subtitle: lang.at("label", default: none),
+ above: if skills.at("abilities", default: ()).len() == 0 {
+ space-none
+ } else {
+ space-skill-gap
+ },
+ )
+ }
+ ]
+ }
+}
+
#let tech-pill(label) = box(
fill: color-page,
stroke: stroke-pill,
@@ -213,23 +254,11 @@
]
#let skills-section-block() = {
- sidebar-subtitle("能力", above: space-none)
- block(below: space-none)[
- #for (i, item) in skills.abilities.enumerate() {
- skill-bar(
- item.name,
- item.level,
- above: if i == 0 { space-none } else { space-skill-gap },
- )
- }
- #skill-bar(
- skills.language.name,
- skills.language.level,
- subtitle: skills.language.label,
- above: space-skill-gap,
- )
- ]
- sidebar-subtitle("技术栈", above: space-subsection-gap)
+ abilities-block()
+ sidebar-subtitle(
+ "技术栈",
+ above: if has-abilities-section() { space-subsection-gap } else { space-none },
+ )
tech-stack-block()
if skills.notes.len() > 0 {
sidebar-subtitle("补充", above: space-subsection-gap)
@@ -239,14 +268,15 @@
/// 主栏经历 / 项目条目
#let timeline-entry(entry, title-key: "company", subtitle-key: "role") = block[
- #text(fill: color-body, size: size-body, weight: "bold")[
- #if subtitle-key != none [
- #entry.at(title-key) / #entry.at(subtitle-key)
- ] else [
- #entry.at(title-key)
+ #block(above: space-entry-title-above, below: space-entry-title-below)[
+ #text(fill: color-body, size: size-body, weight: "bold")[
+ #if subtitle-key != none [
+ #entry.at(title-key) / #entry.at(subtitle-key)
+ ] else [
+ #entry.at(title-key)
+ ]
]
]
- #v(space-body)
#text(fill: color-text-light, size: size-body)[
#entry.location#if entry.location != "" [,]#entry.start - #entry.end
]
@@ -282,8 +312,9 @@
/// 获奖经历条目(bullets 可留空)
#let award-entry(entry) = block[
- #text(fill: color-body, size: size-body, weight: "bold")[#entry.title]
- #v(space-body)
+ #block(above: space-entry-title-above, below: space-entry-title-below)[
+ #text(fill: color-body, size: size-body, weight: "bold")[#entry.title]
+ ]
#text(fill: color-text-light, size: size-body)[#entry.meta]
#if entry.bullets.len() > 0 [
#v(space-body)
diff --git a/resume/data/theme.typ b/resume/data/theme.typ
index d75878c..04f8d4f 100644
--- a/resume/data/theme.typ
+++ b/resume/data/theme.typ
@@ -1,8 +1,9 @@
#import "../../brand/colors.typ": *
-#let color-accent-bright = color-lime-deep
+#let color-icon = color-muted
+#let color-accent-bright = color-body
#let color-accent = color-muted
-#let color-skill-bar = color-lime-mid
+#let color-skill-bar = color-muted
#let color-divider = color-muted.lighten(68%)
#let color-text-light = color-muted.lighten(32%)
@@ -35,9 +36,14 @@
#let space-body = size-body
#let space-title-gap = 12pt
#let space-edu-notes-before = space-title-gap
+#let space-edu-meta-gap = 10pt
#let leading-edu-notes = size-secondary
-#let space-between-entries = 12pt
+#let space-between-entries = 20pt
+#let space-entry-title-above = 6pt
+#let space-entry-title-below = 14pt
#let space-block = 18pt
+#let space-main-section = 26pt
+#let space-main-title-below = 14pt
#let space-hero-to-photo = space-block
#let space-column-gap = space-title-gap
@@ -86,6 +92,6 @@
#let page-margin = (
top: 2cm,
bottom: 2cm,
- left: 2cm,
- right: 2cm,
+ left: 1.5cm,
+ right: 1.5cm,
)
diff --git a/resume/sample.pdf b/resume/sample.pdf
index 097d9ea..b31f402 100644
--- a/resume/sample.pdf
+++ b/resume/sample.pdf
@@ -2,28 +2,28 @@
%
1 0 obj
-<>
+<>
endobj
2 0 obj
-<>/K[95 0 R]/ParentTree<>/ParentTreeNextKey 4>>
+<>/K[85 0 R]/ParentTree<>/ParentTreeNextKey 4>>
endobj
3 0 obj
-[4 0 R 5 0 R 6 0 R 6 0 R 6 0 R 6 0 R 6 0 R 6 0 R 6 0 R 8 0 R 12 0 R 13 0 R 15 0 R 18 0 R 20 0 R 23 0 R 25 0 R 28 0 R 30 0 R 33 0 R 34 0 R 35 0 R 36 0 R 37 0 R 38 0 R 38 0 R 39 0 R 40 0 R 41 0 R 43 0 R 46 0 R 46 0 R 46 0 R 46 0 R 46 0 R 46 0 R 46 0 R 46 0 R 46 0 R 46 0 R 46 0 R 46 0 R 46 0 R 46 0 R 46 0 R 46 0 R 46 0 R 46 0 R 46 0 R 46 0 R 49 0 R 50 0 R 51 0 R 52 0 R 53 0 R 53 0 R 55 0 R 56 0 R 56 0 R 58 0 R 59 0 R 59 0 R 59 0 R 59 0 R 59 0 R 59 0 R 59 0 R 59 0 R 62 0 R 63 0 R 64 0 R 65 0 R 65 0 R 65 0 R 65 0 R 65 0 R 65 0 R 67 0 R 68 0 R 68 0 R 70 0 R 71 0 R 71 0 R 71 0 R 71 0 R 74 0 R 75 0 R 75 0 R 76 0 R 77 0 R 78 0 R 78 0 R 80 0 R 81 0 R 81 0 R 81 0 R 81 0 R 81 0 R 81 0 R 81 0 R 81 0 R 81 0 R 84 0 R 84 0 R 85 0 R 86 0 R 87 0 R 87 0 R 89 0 R 90 0 R 90 0 R 90 0 R 90 0 R 90 0 R 90 0 R]
+[4 0 R 5 0 R 6 0 R 6 0 R 6 0 R 6 0 R 6 0 R 6 0 R 6 0 R 8 0 R 12 0 R 13 0 R 15 0 R 18 0 R 20 0 R 23 0 R 25 0 R 28 0 R 30 0 R 33 0 R 34 0 R 35 0 R 36 0 R 37 0 R 38 0 R 38 0 R 38 0 R 38 0 R 38 0 R 38 0 R 38 0 R 38 0 R 38 0 R 38 0 R 38 0 R 38 0 R 38 0 R 38 0 R 38 0 R 38 0 R 38 0 R 38 0 R 38 0 R 38 0 R 38 0 R 41 0 R 41 0 R 42 0 R 43 0 R 44 0 R 46 0 R 47 0 R 47 0 R 49 0 R 50 0 R 50 0 R 50 0 R 50 0 R 50 0 R 50 0 R 50 0 R 50 0 R 53 0 R 54 0 R 55 0 R 56 0 R 56 0 R 56 0 R 56 0 R 56 0 R 58 0 R 59 0 R 59 0 R 61 0 R 62 0 R 62 0 R 62 0 R 62 0 R 65 0 R 65 0 R 65 0 R 66 0 R 67 0 R 68 0 R 68 0 R 70 0 R 71 0 R 71 0 R 71 0 R 71 0 R 71 0 R 71 0 R 71 0 R 71 0 R 74 0 R 74 0 R 75 0 R 76 0 R 77 0 R 79 0 R 80 0 R 80 0 R 80 0 R 80 0 R 80 0 R 80 0 R]
endobj
4 0 obj
-<>
+<>
endobj
5 0 obj
-<>
+<>
endobj
6 0 obj
-<>
+<>
endobj
7 0 obj
<>
endobj
8 0 obj
-<>]/K[9]/Pg 113 0 R>>
+<>]/K[9]/Pg 103 0 R>>
endobj
9 0 obj
<>
@@ -32,328 +32,298 @@ endobj
<>
endobj
11 0 obj
-<>
+<>
endobj
12 0 obj
-<>]/K[10]/Pg 113 0 R>>
+<>]/K[10]/Pg 103 0 R>>
endobj
13 0 obj
-<>]/K[11]/Pg 113 0 R>>
+<>]/K[11]/Pg 103 0 R>>
endobj
14 0 obj
<>
endobj
15 0 obj
-<>]/K[12]/Pg 113 0 R>>
+<>]/K[12]/Pg 103 0 R>>
endobj
16 0 obj
<>
endobj
17 0 obj
-<>
+<>
endobj
18 0 obj
-<>]/K[13]/Pg 113 0 R>>
+<>]/K[13]/Pg 103 0 R>>
endobj
19 0 obj
<>
endobj
20 0 obj
-<>]/K[14<>]/Pg 113 0 R>>
+<>]/K[14<>]/Pg 103 0 R>>
endobj
21 0 obj
<>
endobj
22 0 obj
-<>
+<>
endobj
23 0 obj
-<>]/K[15]/Pg 113 0 R>>
+<>]/K[15]/Pg 103 0 R>>
endobj
24 0 obj
<>
endobj
25 0 obj
-<>]/K[16<>]/Pg 113 0 R>>
+<>]/K[16<>]/Pg 103 0 R>>
endobj
26 0 obj
<>
endobj
27 0 obj
-<>
+<>
endobj
28 0 obj
-<>]/K[17]/Pg 113 0 R>>
+<>]/K[17]/Pg 103 0 R>>
endobj
29 0 obj
<>
endobj
30 0 obj
-<>]/K[18<>]/Pg 113 0 R>>
+<>]/K[18<>]/Pg 103 0 R>>
endobj
31 0 obj
<>
endobj
32 0 obj
-<>
+<>
endobj
33 0 obj
-<>]/K[19]/Pg 113 0 R>>
+<>]/K[19]/Pg 103 0 R>>
endobj
34 0 obj
-<>
+<>
endobj
35 0 obj
-<>
+<>
endobj
36 0 obj
-<>
+<>
endobj
37 0 obj
-<>
+<>
endobj
38 0 obj
-<>]/K[24 25]/Pg 113 0 R>>
+<>]/K[24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44]/Pg 103 0 R>>
endobj
39 0 obj
-<>
+<>
endobj
40 0 obj
-<>
+<>
endobj
41 0 obj
-<>]/K[28]/Pg 113 0 R>>
+<>]/K[45 46]/Pg 103 0 R>>
endobj
42 0 obj
-<>
+<>
endobj
43 0 obj
-<>]/K[29]/Pg 113 0 R>>
+<>
endobj
44 0 obj
-<>
+<>
endobj
45 0 obj
-<>
+<>
endobj
46 0 obj
-<>]/K[30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49]/Pg 113 0 R>>
+<>
endobj
47 0 obj
-<>
+<>
endobj
48 0 obj
-<>
+<>
endobj
49 0 obj
-<>]/K[50]/Pg 113 0 R>>
+<>
endobj
50 0 obj
-<>
+<>
endobj
51 0 obj
-<>
+<>
endobj
52 0 obj
-<>
+<>]/K[45 0 R 48 0 R 51 0 R]>>
endobj
53 0 obj
-<>
+<>]/K[62]/Pg 103 0 R>>
endobj
54 0 obj
-<>
+<>
endobj
55 0 obj
-<>
+<>
endobj
56 0 obj
-<>
+<>
endobj
57 0 obj
-<>
+<>
endobj
58 0 obj
-<>
+<>
endobj
59 0 obj
-<>
+<>
endobj
60 0 obj
-<>
+<>
endobj
61 0 obj
-<>]/K[54 0 R 57 0 R 60 0 R]>>
+<>
endobj
62 0 obj
-<>
+<>
endobj
63 0 obj
-<>
+<>
endobj
64 0 obj
-<>
+<>]/K[57 0 R 60 0 R 63 0 R]>>
endobj
65 0 obj
-<>
+<>]/K[78 79 80]/Pg 103 0 R>>
endobj
66 0 obj
-<>
+<>
endobj
67 0 obj
-<>
+<>
endobj
68 0 obj
-<>
+<>
endobj
69 0 obj
<>
endobj
70 0 obj
-<>
+<>
endobj
71 0 obj
-<>
+<>
endobj
72 0 obj
<>
endobj
73 0 obj
-<>]/K[66 0 R 69 0 R 72 0 R]>>
+<>]/K[69 0 R 72 0 R]>>
endobj
74 0 obj
-<>]/K[85]/Pg 113 0 R>>
+<>]/K[94 95]/Pg 103 0 R>>
endobj
75 0 obj
-<>
+<>
endobj
76 0 obj
-<>
+<>
endobj
77 0 obj
-<>
+<>
endobj
78 0 obj
-<>
+<>
endobj
79 0 obj
-<>
+<>
endobj
80 0 obj
-<>
+<>
endobj
81 0 obj
-<>
+<>
endobj
82 0 obj
-<>
+<>]/K[78 0 R 81 0 R]>>
endobj
83 0 obj
-<>]/K[79 0 R 82 0 R]>>
+<>
endobj
84 0 obj
-<>
+<>
endobj
85 0 obj
-<>
+<>
endobj
86 0 obj
-<>
+<>/F 4/StructParent 0/Contents>>
endobj
87 0 obj
-<>
+<>/F 4/StructParent 1/Contents>>
endobj
88 0 obj
-<>
+<>/F 4/StructParent 2/Contents(https://3506897731.github.io/)>>
endobj
89 0 obj
-<>
+[/ICCBased 117 0 R]
endobj
90 0 obj
-<>
+<>/XObject<>/Font<>>>
endobj
91 0 obj
-<>
+<>
endobj
92 0 obj
-<>]/K[88 0 R 91 0 R]>>
+<>/FontDescriptor 93 0 R/DW 0/CIDToGIDMap/Identity/W[0 0 697.2656 1 7 1000 8 8 297.85156 9 9 341.3086 10 24 1000]>>
endobj
93 0 obj
-<>
+<>
endobj
94 0 obj
-<>
+<>
endobj
95 0 obj
-<>
+<>/FontDescriptor 96 0 R/DW 0/CIDToGIDMap/Identity/W[0 0 697.2656 1 14 1000 15 15 295.89844 16 16 586.4258 17 17 1000 18 18 586.4258 19 31 1000 32 32 703.6133 33 33 293.9453 34 40 1000 41 41 639.64844 42 42 567.3828 43 43 616.21094 44 44 372.5586 45 81 1000 82 86 586.4258 87 87 1031.25 88 88 240.72266 89 89 501.46484 90 90 635.7422 91 91 937.0117 92 93 586.4258 94 94 266.11328 95 95 615.72266 96 96 616.21094 97 97 638.6719 98 98 427.2461 99 99 1000 100 100 240.72266 101 101 540.03906 102 102 652.83203 103 103 462.89062 104 104 611.8164 105 105 529.2969 106 106 395.9961 107 107 552.7344 108 108 524.90234 109 109 573.2422 110 110 381.83594 111 111 743.65234 112 112 513.1836 113 113 506.83594 114 114 977.0508 115 115 577.14844 116 116 814.9414 117 117 639.64844 118 118 432.6172 119 120 1000 121 121 439.45312 122 158 1000 159 159 586.4258 160 160 741.6992 161 163 1000 164 164 889.64844 165 180 1000 181 181 544.4336 182 182 266.11328 183 213 1000 214 214 814.9414 215 215 812.9883 216 216 645.01953 217 237 1000 238 238 668.9453 239 239 746.58203 240 240 761.71875 241 241 1000]>>
endobj
96 0 obj
-<>/F 4/StructParent 0/Contents>>
+<>
endobj
97 0 obj
-<>/F 4/StructParent 1/Contents>>
+<>
endobj
98 0 obj
-<>/F 4/StructParent 2/Contents(https://3506897731.github.io/)>>
+<>/FontDescriptor 99 0 R/DW 0/CIDToGIDMap/Identity/W[0 0 697.2656 1 3 1000]>>
endobj
99 0 obj
-[/ICCBased 127 0 R]
+<>
endobj
100 0 obj
-<>/XObject<>/Font<>>>
+<>
endobj
101 0 obj
-<>
+<>/FontDescriptor 102 0 R/DW 0/CIDToGIDMap/Identity/W[0 0 697.2656 1 12 1000 13 13 297.85156 14 14 472.65625 15 27 1000 28 28 821.28906 29 29 574.21875 30 30 666.0156 31 31 582.03125 32 32 423.82812 33 33 818.3594 34 37 1000 38 38 546.875 39 39 577.6367 40 40 666.0156 41 41 295.89844 42 47 1000]>>
endobj
102 0 obj
-<>/FontDescriptor 103 0 R/DW 0/CIDToGIDMap/Identity/W[0 0 697.2656 1 7 1000 8 8 297.85156 9 9 341.3086 10 24 1000]>>
+<>
endobj
103 0 obj
-<>
+<>
endobj
104 0 obj
-<>
-endobj
-105 0 obj
-<>/FontDescriptor 106 0 R/DW 0/CIDToGIDMap/Identity/W[0 0 697.2656 1 14 1000 15 15 295.89844 16 16 586.4258 17 17 1000 18 18 586.4258 19 31 1000 32 32 703.6133 33 33 293.9453 34 40 1000 41 41 639.64844 42 42 567.3828 43 43 616.21094 44 44 372.5586 45 81 1000 82 86 586.4258 87 87 1031.25 88 88 240.72266 89 89 501.46484 90 90 635.7422 91 91 937.0117 92 93 586.4258 94 94 266.11328 95 95 615.72266 96 96 616.21094 97 97 638.6719 98 98 427.2461 99 99 1000 100 100 240.72266 101 101 540.03906 102 109 1000 110 110 652.83203 111 111 462.89062 112 112 611.8164 113 113 529.2969 114 114 395.9961 115 115 552.7344 116 116 524.90234 117 117 573.2422 118 118 381.83594 119 119 743.65234 120 120 513.1836 121 121 506.83594 122 122 977.0508 123 123 577.14844 124 124 814.9414 125 125 639.64844 126 126 432.6172 127 128 1000 129 129 439.45312 130 165 1000 166 166 586.4258 167 167 741.6992 168 170 1000 171 171 889.64844 172 186 1000 187 187 544.4336 188 188 266.11328 189 219 1000 220 220 814.9414 221 221 812.9883 222 222 645.01953 223 243 1000 244 244 668.9453 245 245 746.58203 246 246 761.71875 247 247 1000]>>
-endobj
-106 0 obj
-<>
-endobj
-107 0 obj
-<>
-endobj
-108 0 obj
-<>/FontDescriptor 109 0 R/DW 0/CIDToGIDMap/Identity/W[0 0 697.2656 1 5 1000]>>
-endobj
-109 0 obj
-<>
-endobj
-110 0 obj
-<>
-endobj
-111 0 obj
-<>/FontDescriptor 112 0 R/DW 0/CIDToGIDMap/Identity/W[0 0 697.2656 1 12 1000 13 13 297.85156 14 14 472.65625 15 27 1000 28 28 821.28906 29 29 574.21875 30 30 666.0156 31 31 582.03125 32 32 423.82812 33 33 818.3594 34 37 1000 38 38 546.875 39 39 577.6367 40 40 666.0156 41 41 295.89844 42 47 1000]>>
-endobj
-112 0 obj
-<>
-endobj
-113 0 obj
-<>
-endobj
-114 0 obj
<>
stream
x {~
endstream
endobj
-115 0 obj
+105 0 obj
<>
stream
xmˎ0E|E)`^RXʢfW2H 0l5*kiכqu܌WCD;QCyӞU{[$>zrkHeCGo ؓpA{_+Y=i@6
5\:%'gxk#nf4OYcT6K. z{[y$Na[
$03Jo@_!p?G]J_CA>[ qF]c\!
RFvi&ȷ"f>
stream
x|}|SUZ眜II6M4I6i4Hȡ_
@@ -404,431 +374,401 @@ s-q%HJ
[~9r% גodoFr ̸]t˚\oS|]^{0L{ [
endstream
endobj
-117 0 obj
-<>
+107 0 obj
+<>
stream
-x/ >
+x8
endstream
endobj
-118 0 obj
-<>
+108 0 obj
+<>
stream
-xmK+:w$Cd,@ܻKm_IhA9 QT7?|8Zvݯ/ϗf9^u=r=_P<_}οM)1Էax~A4<x66a6v:>߯6|>Wz>߇FK_/t|f.9z~~gv=~ؿ
~|\r?
-/Hᅭr
p7Fq>z}>}YOq7lS}
ɍ+[Z^Iua7l}2siq6V
m5X8솭CUe1g1
V
[cQk0-3ƍ/a)_3,m%|Nb -Qb)|M6s~|&X{(|Sh>X3gX_n/N
-_lc7=?+|a |SL8>ctgL~V E'|F"|;܋UH"xL'| o'|y^T:cO'|I%|ii _ZL/v d
_V]<-{
-o3no<
~W2_3NӍ\'|9DW/F="
-<{K}{կu2 fL&ˁ9=i;OPKTbOSKTpO/R-ӐRəOOODȄt