21 | {% endblock main_content %}
--------------------------------------------------------------------------------
/themes/apollo/templates/taxonomy_single.html:
--------------------------------------------------------------------------------
1 | {% extends "index.html" %}
2 |
3 | {% block main_content %}
4 |
5 | {{ post_macros::list_tag_posts(pages=term.pages, tag_name=term.name) }}
6 |
7 | {% endblock main_content %}
8 |
--------------------------------------------------------------------------------
/themes/apollo/theme.toml:
--------------------------------------------------------------------------------
1 | name = "apollo"
2 | description = "Modern and minimalistic blog theme"
3 | min_version = "0.14.0"
4 | license = "MIT"
5 | homepage = "https://github.com/not-matthias/apollo"
6 | demo = "https://not-matthias.github.io/apollo"
7 |
8 | # Any variable there can be overridden in the end user `config.toml`
9 | # You don't need to prefix variables by the theme name but as this will
10 | # be merged with user data, some kind of prefix or nesting is preferable
11 | # Use snake_casing to be consistent with the rest of Zola
12 | [extra]
13 |
14 | [author]
15 | name = "not-matthias"
16 | homepage = "https://github.com/not-matthias"
17 |
--------------------------------------------------------------------------------
/typ/intro/build-config.toml:
--------------------------------------------------------------------------------
1 | [entries.short]
2 | entry = "short.typ"
3 |
4 | [entries.full]
5 | entry = "full.typ"
--------------------------------------------------------------------------------
/typ/intro/full.typ:
--------------------------------------------------------------------------------
1 | #import "@preview/shiroa:0.1.0": *
2 | #import "@preview/typst-apollo:0.1.0": pages
3 | #import pages: *
4 | #import "@preview/shiroa:0.1.0": get-page-width, target, is-web-target, is-pdf-target, plain-text
5 |
6 | #import "@preview/unequivocal-ams:0.1.0": theorem, proof
7 |
8 | #show: project.with(
9 | title: [],
10 | authors: (
11 | (
12 | name: "Darkflames",
13 | email: "darkf1ames@pm.me",
14 | ),
15 | (
16 | name: "Darkflames",
17 | email: "darkf1ames@pm.me",
18 | ),
19 | ),
20 | )
21 |
22 | #set par(justify: true)
23 | #set heading(numbering: "1.")
24 |
25 | #align(center, text(17pt)[
26 | Test - Version: Full
27 | ])
28 |
29 | = Beginning
30 | Call me Ishmael. Some years ago --- never mind how long precisely ---
31 | having little or no money in my purse, and nothing particular to
32 | interest me on shore, I thought I would sail about a little and see
33 | the watery part of the world. It is a way I have of driving off the
34 | spleen, and regulating the circulation. Whenever I find myself
35 | growing grim about the mouth; whenever it is a damp, drizzly November
36 | in my soul; whenever I find myself involuntarily pausing before coffin
37 | warehouses, and bringing up the rear of every funeral I meet; and
38 | especially whenever my hypos get such an upper hand of me, that it
39 | requires a strong moral principle to prevent me from deliberately
40 | stepping into the street, and methodically knocking people's hats off
41 | --- then, I account it high time to get to sea as soon as I can. This
42 | is my substitute for pistol and ball. With a philosophical flourish
43 | Cato throws himself upon his sword; I quietly take to the ship. There
44 | is nothing surprising in this. If they but knew it, almost all men in
45 | their degree, some time or other, cherish very nearly the same
46 | feelings towards the ocean with me.
47 |
48 | #cross-link("/posts/markdown/")[cross reference to the markdown]
49 |
50 | There now is your insular city of the Manhattoes, belted round by
51 | wharves as Indian isles by coral reefs - commerce surrounds it with
52 | her surf. Right and left, the streets take you waterward. Its extreme
53 | down-town is the battery, where that noble mole is washed by waves,
54 | and cooled by breezes, which a few hours previous were out of sight of
55 | land. Look at the crowds of water-gazers there.
56 |
57 | Call me Ishmael. Some years ago --- never mind how long precisely ---
58 | having little or no money in my purse, and nothing particular to
59 | interest me on shore, I thought I would sail about a little and see
60 | the watery part of the world. It is a way I have of driving off the
61 | spleen, and regulating the circulation. Whenever I find myself
62 | growing grim about the mouth; whenever it is a damp, drizzly November
63 | in my soul; whenever I find myself involuntarily pausing before coffin
64 | warehouses, and bringing up the rear of every funeral I meet; and
65 | especially whenever my hypos get such an upper hand of me, that it
66 | requires a strong moral principle to prevent me from deliberately
67 | stepping into the street, and methodically knocking people's hats off
68 | --- then, I account it high time to get to sea as soon as I can. This
69 | is my substitute for pistol and ball. With a philosophical flourish
70 | Cato throws himself upon his sword; I quietly take to the ship. There
71 | is nothing surprising in this. If they but knew it, almost all men in
72 | their degree, some time or other, cherish very nearly the same
73 | feelings towards the ocean with me.
74 |
75 | There now is your insular city of the Manhattoes, belted round by
76 | wharves as Indian isles by coral reefs - commerce surrounds it with
77 | her surf. Right and left, the streets take you waterward. Its extreme
78 | down-town is the battery, where that noble mole is washed by waves,
79 | and cooled by breezes, which a few hours previous were out of sight of
80 | land. Look at the crowds of water-gazers there.
81 | Anyone caught using formulas such as $sqrt(x+y)=sqrt(x)+sqrt(y)$
82 | or $1/(x+y) = 1/x + 1/y$ will fail.
83 |
84 | The binomial theorem is
85 | $ (x+y)^n=sum_(k=0)^n binom(n, k) x^k y^(n-k). $
86 |
87 | A favorite sum of most mathematicians is
88 | $ sum_(n=1)^oo 1 / n^2 = pi^2 / 6. $
89 |
90 | Likewise a popular integral is
91 | $ integral_(-oo)^oo e^(-x^2) dif x = sqrt(pi) $
92 |
93 | #theorem[
94 | The square of any real number is non-negative.
95 | ]
96 |
97 | #proof[
98 | Any real number $x$ satisfies $x > 0$, $x = 0$, or $x < 0$. If $x = 0$,
99 | then $x^2 = 0 >= 0$. If $x > 0$ then as a positive time a positive is
100 | positive we have $x^2 = x x > 0$. If $x < 0$ then $−x > 0$ and so by
101 | what we have just done $x^2 = (−x)^2 > 0$. So in all cases $x^2 ≥ 0$.
102 | ]
103 |
104 | = Introduction
105 | This is a new section. @beg
106 | You can use tables like @solids.
107 |
108 |
109 | #figure(
110 | table(
111 | columns: (1fr, auto, auto),
112 | inset: 5pt,
113 | align: horizon,
114 | [], [*Area*], [*Parameters*],
115 | [*Cylinder*],
116 | $ pi h (D^2 - d^2) / 4 $,
117 | [$h$: height \
118 | $D$: outer radius \
119 | $d$: inner radius],
120 |
121 | [*Tetrahedron*], $ sqrt(2) / 12 a^3 $, [$a$: edge length],
122 | ),
123 | caption: "Solids",
124 | )
125 |
126 | == Things that need to be done
127 | Prove theorems.
128 |
129 | = Background
130 | #lorem(40)
131 |
--------------------------------------------------------------------------------
/typ/intro/short.typ:
--------------------------------------------------------------------------------
1 | #import "@preview/shiroa:0.1.0": *
2 | #import "@preview/typst-apollo:0.1.0": pages
3 | #import pages: *
4 | #import "@preview/shiroa:0.1.0": get-page-width, target, is-web-target, is-pdf-target, plain-text
5 |
6 | #import "@preview/unequivocal-ams:0.1.0": theorem, proof
7 |
8 | #show: project.with(
9 | title: [],
10 | authors: (
11 | (
12 | name: "Darkflames",
13 | email: "darkf1ames@pm.me",
14 | ),
15 | (
16 | name: "Darkflames",
17 | email: "darkf1ames@pm.me",
18 | ),
19 | ),
20 | )
21 |
22 | #set par(justify: true)
23 | #set heading(numbering: "1.")
24 |
25 | #align(center, text(17pt)[
26 | Test - Version: Short
27 | ])
28 |
29 | = Beginning
30 | Call me Ishmael. Some years ago --- never mind how long precisely ---
31 | having little or no money in my purse, and nothing particular to
32 | interest me on shore, I thought I would sail about a little and see
33 | the watery part of the world. It is a way I have of driving off the
34 | spleen, and regulating the circulation. Whenever I find myself
35 | growing grim about the mouth; whenever it is a damp, drizzly November
36 | in my soul; whenever I find myself involuntarily pausing before coffin
37 | warehouses, and bringing up the rear of every funeral I meet; and
38 | especially whenever my hypos get such an upper hand of me, that it
39 | requires a strong moral principle to prevent me from deliberately
40 | stepping into the street, and methodically knocking people's hats off
41 | --- then, I account it high time to get to sea as soon as I can. This
42 | is my substitute for pistol and ball. With a philosophical flourish
43 | Cato throws himself upon his sword; I quietly take to the ship. There
44 | is nothing surprising in this. If they but knew it, almost all men in
45 | their degree, some time or other, cherish very nearly the same
46 | feelings towards the ocean with me.
47 |
48 | #cross-link("/posts/markdown/")[cross reference to the markdown]
49 |
50 | There now is your insular city of the Manhattoes, belted round by
51 | wharves as Indian isles by coral reefs - commerce surrounds it with
52 | her surf. Right and left, the streets take you waterward. Its extreme
53 | down-town is the battery, where that noble mole is washed by waves,
54 | and cooled by breezes, which a few hours previous were out of sight of
55 | land. Look at the crowds of water-gazers there.
56 |
57 | Call me Ishmael. Some years ago --- never mind how long precisely ---
58 | having little or no money in my purse, and nothing particular to
59 | interest me on shore, I thought I would sail about a little and see
60 | the watery part of the world. It is a way I have of driving off the
61 | spleen, and regulating the circulation. Whenever I find myself
62 | growing grim about the mouth; whenever it is a damp, drizzly November
63 | in my soul; whenever I find myself involuntarily pausing before coffin
64 | warehouses, and bringing up the rear of every funeral I meet; and
65 | especially whenever my hypos get such an upper hand of me, that it
66 | requires a strong moral principle to prevent me from deliberately
67 | stepping into the street, and methodically knocking people's hats off
68 | --- then, I account it high time to get to sea as soon as I can. This
69 | is my substitute for pistol and ball. With a philosophical flourish
70 | Cato throws himself upon his sword; I quietly take to the ship. There
71 | is nothing surprising in this. If they but knew it, almost all men in
72 | their degree, some time or other, cherish very nearly the same
73 | feelings towards the ocean with me.
74 |
75 | There now is your insular city of the Manhattoes, belted round by
76 | wharves as Indian isles by coral reefs - commerce surrounds it with
77 | her surf. Right and left, the streets take you waterward. Its extreme
78 | down-town is the battery, where that noble mole is washed by waves,
79 | and cooled by breezes, which a few hours previous were out of sight of
80 | land. Look at the crowds of water-gazers there.
81 | Anyone caught using formulas such as $sqrt(x+y)=sqrt(x)+sqrt(y)$
82 | or $1/(x+y) = 1/x + 1/y$ will fail.
83 |
84 | The binomial theorem is
85 | $ (x+y)^n=sum_(k=0)^n binom(n, k) x^k y^(n-k). $
86 |
87 | A favorite sum of most mathematicians is
88 | $ sum_(n=1)^oo 1 / n^2 = pi^2 / 6. $
89 |
90 | Likewise a popular integral is
91 | $ integral_(-oo)^oo e^(-x^2) dif x = sqrt(pi) $
92 |
93 | #theorem[
94 | The square of any real number is non-negative.
95 | ]
96 |
97 | #proof[
98 | Any real number $x$ satisfies $x > 0$, $x = 0$, or $x < 0$. If $x = 0$,
99 | then $x^2 = 0 >= 0$. If $x > 0$ then as a positive time a positive is
100 | positive we have $x^2 = x x > 0$. If $x < 0$ then $−x > 0$ and so by
101 | what we have just done $x^2 = (−x)^2 > 0$. So in all cases $x^2 ≥ 0$.
102 | ]
103 |
104 | = Introduction
105 | This is a new section. @beg
106 | You can use tables like @solids.
107 |
108 |
109 | #figure(
110 | table(
111 | columns: (1fr, auto, auto),
112 | inset: 5pt,
113 | align: horizon,
114 | [], [*Area*], [*Parameters*],
115 | [*Cylinder*],
116 | $ pi h (D^2 - d^2) / 4 $,
117 | [$h$: height \
118 | $D$: outer radius \
119 | $d$: inner radius],
120 |
121 | [*Tetrahedron*], $ sqrt(2) / 12 a^3 $, [$a$: edge length],
122 | ),
123 | caption: "Solids",
124 | )
125 |
126 | == Things that need to be done
127 | Prove theorems.
128 |
129 | = Background
130 | #lorem(40)
131 |
--------------------------------------------------------------------------------
/typ/posts/test/main.typ:
--------------------------------------------------------------------------------
1 | #import "@preview/shiroa:0.1.0": *
2 | #import "@preview/typst-apollo:0.1.0": pages
3 | #import pages: *
4 | #import "@preview/shiroa:0.1.0": get-page-width, target, is-web-target, is-pdf-target, plain-text
5 |
6 | #import "@preview/unequivocal-ams:0.1.0": theorem, proof
7 |
8 | #show: project.with(
9 | title: "Test",
10 | authors: (
11 | (
12 | name: "Darkflames",
13 | email: "darkf1ames@pm.me",
14 | ),
15 | (
16 | name: "Darkflames",
17 | email: "darkf1ames@pm.me",
18 | ),
19 | ),
20 | )
21 |
22 | #set par(justify: true)
23 | #set heading(numbering: "1.")
24 |
25 | = Beginning
26 | Call me Ishmael. Some years ago --- never mind how long precisely ---
27 | having little or no money in my purse, and nothing particular to
28 | interest me on shore, I thought I would sail about a little and see
29 | the watery part of the world. It is a way I have of driving off the
30 | spleen, and regulating the circulation. Whenever I find myself
31 | growing grim about the mouth; whenever it is a damp, drizzly November
32 | in my soul; whenever I find myself involuntarily pausing before coffin
33 | warehouses, and bringing up the rear of every funeral I meet; and
34 | especially whenever my hypos get such an upper hand of me, that it
35 | requires a strong moral principle to prevent me from deliberately
36 | stepping into the street, and methodically knocking people's hats off
37 | --- then, I account it high time to get to sea as soon as I can. This
38 | is my substitute for pistol and ball. With a philosophical flourish
39 | Cato throws himself upon his sword; I quietly take to the ship. There
40 | is nothing surprising in this. If they but knew it, almost all men in
41 | their degree, some time or other, cherish very nearly the same
42 | feelings towards the ocean with me. @netwok2020
43 |
44 | #cross-link("/posts/markdown/")[cross reference to the markdown]
45 |
46 | There now is your insular city of the Manhattoes, belted round by
47 | wharves as Indian isles by coral reefs - commerce surrounds it with
48 | her surf. Right and left, the streets take you waterward. Its extreme
49 | down-town is the battery, where that noble mole is washed by waves,
50 | and cooled by breezes, which a few hours previous were out of sight of
51 | land. Look at the crowds of water-gazers there.
52 |
53 | Call me Ishmael. Some years ago --- never mind how long precisely ---
54 | having little or no money in my purse, and nothing particular to
55 | interest me on shore, I thought I would sail about a little and see
56 | the watery part of the world. It is a way I have of driving off the
57 | spleen, and regulating the circulation. Whenever I find myself
58 | growing grim about the mouth; whenever it is a damp, drizzly November
59 | in my soul; whenever I find myself involuntarily pausing before coffin
60 | warehouses, and bringing up the rear of every funeral I meet; and
61 | especially whenever my hypos get such an upper hand of me, that it
62 | requires a strong moral principle to prevent me from deliberately
63 | stepping into the street, and methodically knocking people's hats off
64 | --- then, I account it high time to get to sea as soon as I can. This
65 | is my substitute for pistol and ball. With a philosophical flourish
66 | Cato throws himself upon his sword; I quietly take to the ship. There
67 | is nothing surprising in this. If they but knew it, almost all men in
68 | their degree, some time or other, cherish very nearly the same
69 | feelings towards the ocean with me. @netwok2020
70 |
71 | There now is your insular city of the Manhattoes, belted round by
72 | wharves as Indian isles by coral reefs - commerce surrounds it with
73 | her surf. Right and left, the streets take you waterward. Its extreme
74 | down-town is the battery, where that noble mole is washed by waves,
75 | and cooled by breezes, which a few hours previous were out of sight of
76 | land. Look at the crowds of water-gazers there.
77 | Anyone caught using formulas such as $sqrt(x+y)=sqrt(x)+sqrt(y)$
78 | or $1/(x+y) = 1/x + 1/y$ will fail.
79 |
80 | The binomial theorem is
81 | $ (x+y)^n=sum_(k=0)^n binom(n, k) x^k y^(n-k). $
82 |
83 | A favorite sum of most mathematicians is
84 | $ sum_(n=1)^oo 1 / n^2 = pi^2 / 6. $
85 |
86 | Likewise a popular integral is
87 | $ integral_(-oo)^oo e^(-x^2) dif x = sqrt(pi) $
88 |
89 | #theorem[
90 | The square of any real number is non-negative.
91 | ]
92 |
93 | #proof[
94 | Any real number $x$ satisfies $x > 0$, $x = 0$, or $x < 0$. If $x = 0$,
95 | then $x^2 = 0 >= 0$. If $x > 0$ then as a positive time a positive is
96 | positive we have $x^2 = x x > 0$. If $x < 0$ then $−x > 0$ and so by
97 | what we have just done $x^2 = (−x)^2 > 0$. So in all cases $x^2 ≥ 0$.
98 | ]
99 |
100 | = Introduction
101 | This is a new section. @beg
102 | You can use tables like @solids.
103 |
104 |
105 | #figure(
106 | table(
107 | columns: (1fr, auto, auto),
108 | inset: 5pt,
109 | align: horizon,
110 | [], [*Area*], [*Parameters*],
111 | [*Cylinder*],
112 | $ pi h (D^2 - d^2) / 4 $,
113 | [$h$: height \
114 | $D$: outer radius \
115 | $d$: inner radius],
116 |
117 | [*Tetrahedron*], $ sqrt(2) / 12 a^3 $, [$a$: edge length],
118 | ),
119 | caption: "Solids",
120 | )
121 |
122 | == Things that need to be done
123 | Prove theorems.
124 |
125 | = Background
126 | #lorem(40)
127 |
128 | #bibliography("refs.bib")
129 |
--------------------------------------------------------------------------------
/typ/posts/test/refs.bib:
--------------------------------------------------------------------------------
1 | @article{netwok2020,
2 | title={At-scale impact of the {Net Wok}: A culinarically holistic investigation of distributed dumplings},
3 | author={Astley, Rick and Morris, Linda},
4 | journal={Armenian Journal of Proceedings},
5 | volume={61},
6 | pages={192--219},
7 | year=2020,
8 | publisher={Automatic Publishing Inc.}
9 | }
10 |
--------------------------------------------------------------------------------
/typ/single.typ:
--------------------------------------------------------------------------------
1 | #import "@preview/shiroa:0.1.0": *
2 | #import "@preview/typst-apollo:0.1.0": pages
3 | #import pages: *
4 | #import "@preview/shiroa:0.1.0": get-page-width, target, is-web-target, is-pdf-target, plain-text
5 |
6 | #import "@preview/unequivocal-ams:0.1.0": theorem, proof
7 |
8 | #show: project.with(
9 | title: "Test",
10 | authors: (
11 | (
12 | name: "Darkflames",
13 | email: "darkf1ames@pm.me",
14 | ),
15 | (
16 | name: "Darkflames",
17 | email: "darkf1ames@pm.me",
18 | ),
19 | ),
20 | )
21 |
22 | #set par(justify: true)
23 | #set heading(numbering: "1.")
24 |
25 | = Beginning
26 | Call me Ishmael. Some years ago --- never mind how long precisely ---
27 | having little or no money in my purse, and nothing particular to
28 | interest me on shore, I thought I would sail about a little and see
29 | the watery part of the world. It is a way I have of driving off the
30 | spleen, and regulating the circulation. Whenever I find myself
31 | growing grim about the mouth; whenever it is a damp, drizzly November
32 | in my soul; whenever I find myself involuntarily pausing before coffin
33 | warehouses, and bringing up the rear of every funeral I meet; and
34 | especially whenever my hypos get such an upper hand of me, that it
35 | requires a strong moral principle to prevent me from deliberately
36 | stepping into the street, and methodically knocking people's hats off
37 | --- then, I account it high time to get to sea as soon as I can. This
38 | is my substitute for pistol and ball. With a philosophical flourish
39 | Cato throws himself upon his sword; I quietly take to the ship. There
40 | is nothing surprising in this. If they but knew it, almost all men in
41 | their degree, some time or other, cherish very nearly the same
42 | feelings towards the ocean with me.
43 |
44 | #cross-link("/posts/markdown/")[cross reference to the markdown]
45 |
46 | There now is your insular city of the Manhattoes, belted round by
47 | wharves as Indian isles by coral reefs - commerce surrounds it with
48 | her surf. Right and left, the streets take you waterward. Its extreme
49 | down-town is the battery, where that noble mole is washed by waves,
50 | and cooled by breezes, which a few hours previous were out of sight of
51 | land. Look at the crowds of water-gazers there.
52 |
53 | Call me Ishmael. Some years ago --- never mind how long precisely ---
54 | having little or no money in my purse, and nothing particular to
55 | interest me on shore, I thought I would sail about a little and see
56 | the watery part of the world. It is a way I have of driving off the
57 | spleen, and regulating the circulation. Whenever I find myself
58 | growing grim about the mouth; whenever it is a damp, drizzly November
59 | in my soul; whenever I find myself involuntarily pausing before coffin
60 | warehouses, and bringing up the rear of every funeral I meet; and
61 | especially whenever my hypos get such an upper hand of me, that it
62 | requires a strong moral principle to prevent me from deliberately
63 | stepping into the street, and methodically knocking people's hats off
64 | --- then, I account it high time to get to sea as soon as I can. This
65 | is my substitute for pistol and ball. With a philosophical flourish
66 | Cato throws himself upon his sword; I quietly take to the ship. There
67 | is nothing surprising in this. If they but knew it, almost all men in
68 | their degree, some time or other, cherish very nearly the same
69 | feelings towards the ocean with me.
70 |
71 | There now is your insular city of the Manhattoes, belted round by
72 | wharves as Indian isles by coral reefs - commerce surrounds it with
73 | her surf. Right and left, the streets take you waterward. Its extreme
74 | down-town is the battery, where that noble mole is washed by waves,
75 | and cooled by breezes, which a few hours previous were out of sight of
76 | land. Look at the crowds of water-gazers there.
77 | Anyone caught using formulas such as $sqrt(x+y)=sqrt(x)+sqrt(y)$
78 | or $1/(x+y) = 1/x + 1/y$ will fail.
79 |
80 | The binomial theorem is
81 | $ (x+y)^n=sum_(k=0)^n binom(n, k) x^k y^(n-k). $
82 |
83 | A favorite sum of most mathematicians is
84 | $ sum_(n=1)^oo 1 / n^2 = pi^2 / 6. $
85 |
86 | Likewise a popular integral is
87 | $ integral_(-oo)^oo e^(-x^2) dif x = sqrt(pi) $
88 |
89 | #theorem[
90 | The square of any real number is non-negative.
91 | ]
92 |
93 | #proof[
94 | Any real number $x$ satisfies $x > 0$, $x = 0$, or $x < 0$. If $x = 0$,
95 | then $x^2 = 0 >= 0$. If $x > 0$ then as a positive time a positive is
96 | positive we have $x^2 = x x > 0$. If $x < 0$ then $−x > 0$ and so by
97 | what we have just done $x^2 = (−x)^2 > 0$. So in all cases $x^2 ≥ 0$.
98 | ]
99 |
100 | = Introduction
101 | This is a new section. @beg
102 | You can use tables like @solids.
103 |
104 |
105 | #figure(
106 | table(
107 | columns: (1fr, auto, auto),
108 | inset: 5pt,
109 | align: horizon,
110 | [], [*Area*], [*Parameters*],
111 | [*Cylinder*],
112 | $ pi h (D^2 - d^2) / 4 $,
113 | [$h$: height \
114 | $D$: outer radius \
115 | $d$: inner radius],
116 |
117 | [*Tetrahedron*], $ sqrt(2) / 12 a^3 $, [$a$: edge length],
118 | ),
119 | caption: "Solids",
120 | )
121 |
122 | == Things that need to be done
123 | Prove theorems.
124 |
125 | = Background
126 | #lorem(40)
127 |
--------------------------------------------------------------------------------