diff --git a/conf/format.yaml b/conf/format.yaml index 2b4d668..790896d 100644 --- a/conf/format.yaml +++ b/conf/format.yaml @@ -6,4 +6,4 @@ paragraph-spacing: 1.5 # relative to line height line-spacing: 0.75 # relative to line height first-line-indent: 1 # in centimetres font-size: 12 # in point -font-familty: "Noto Serif" \ No newline at end of file +font-familty: "TeX Gyre Termes" diff --git a/res/font/Noto Serif/LICENSE.txt b/res/font/Noto Serif/LICENSE.txt deleted file mode 100644 index 09f020b..0000000 --- a/res/font/Noto Serif/LICENSE.txt +++ /dev/null @@ -1,93 +0,0 @@ -Copyright 2022 The Noto Project Authors (https://github.com/notofonts/latin-greek-cyrillic) - -This Font Software is licensed under the SIL Open Font License, Version 1.1. -This license is copied below, and is also available with a FAQ at: -https://openfontlicense.org - - ------------------------------------------------------------ -SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 ------------------------------------------------------------ - -PREAMBLE -The goals of the Open Font License (OFL) are to stimulate worldwide -development of collaborative font projects, to support the font creation -efforts of academic and linguistic communities, and to provide a free and -open framework in which fonts may be shared and improved in partnership -with others. - -The OFL allows the licensed fonts to be used, studied, modified and -redistributed freely as long as they are not sold by themselves. The -fonts, including any derivative works, can be bundled, embedded, -redistributed and/or sold with any software provided that any reserved -names are not used by derivative works. The fonts and derivatives, -however, cannot be released under any other type of license. The -requirement for fonts to remain under this license does not apply -to any document created using the fonts or their derivatives. - -DEFINITIONS -"Font Software" refers to the set of files released by the Copyright -Holder(s) under this license and clearly marked as such. This may -include source files, build scripts and documentation. - -"Reserved Font Name" refers to any names specified as such after the -copyright statement(s). - -"Original Version" refers to the collection of Font Software components as -distributed by the Copyright Holder(s). - -"Modified Version" refers to any derivative made by adding to, deleting, -or substituting -- in part or in whole -- any of the components of the -Original Version, by changing formats or by porting the Font Software to a -new environment. - -"Author" refers to any designer, engineer, programmer, technical -writer or other person who contributed to the Font Software. - -PERMISSION & CONDITIONS -Permission is hereby granted, free of charge, to any person obtaining -a copy of the Font Software, to use, study, copy, merge, embed, modify, -redistribute, and sell modified and unmodified copies of the Font -Software, subject to the following conditions: - -1) Neither the Font Software nor any of its individual components, -in Original or Modified Versions, may be sold by itself. - -2) Original or Modified Versions of the Font Software may be bundled, -redistributed and/or sold with any software, provided that each copy -contains the above copyright notice and this license. These can be -included either as stand-alone text files, human-readable headers or -in the appropriate machine-readable metadata fields within text or -binary files as long as those fields can be easily viewed by the user. - -3) No Modified Version of the Font Software may use the Reserved Font -Name(s) unless explicit written permission is granted by the corresponding -Copyright Holder. This restriction only applies to the primary font name as -presented to the users. - -4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font -Software shall not be used to promote, endorse or advertise any -Modified Version, except to acknowledge the contribution(s) of the -Copyright Holder(s) and the Author(s) or with their explicit written -permission. - -5) The Font Software, modified or unmodified, in part or in whole, -must be distributed entirely under this license, and must not be -distributed under any other license. The requirement for fonts to -remain under this license does not apply to any document created -using the Font Software. - -TERMINATION -This license becomes null and void if any of the above conditions are -not met. - -DISCLAIMER -THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT -OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE -COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL -DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM -OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/res/font/Noto Serif/Noto Serif Bold.ttf b/res/font/Noto Serif/Noto Serif Bold.ttf deleted file mode 100644 index aa21d44..0000000 Binary files a/res/font/Noto Serif/Noto Serif Bold.ttf and /dev/null differ diff --git a/res/font/Noto Serif/Noto Serif Italic.ttf b/res/font/Noto Serif/Noto Serif Italic.ttf deleted file mode 100644 index 786ecc7..0000000 Binary files a/res/font/Noto Serif/Noto Serif Italic.ttf and /dev/null differ diff --git a/res/font/Noto Serif/Noto Serif Regular.ttf b/res/font/Noto Serif/Noto Serif Regular.ttf deleted file mode 100644 index dc30297..0000000 Binary files a/res/font/Noto Serif/Noto Serif Regular.ttf and /dev/null differ diff --git a/res/font/tex-gyre-termes/texgyretermes-bold.otf b/res/font/tex-gyre-termes/texgyretermes-bold.otf new file mode 100644 index 0000000..c181d55 Binary files /dev/null and b/res/font/tex-gyre-termes/texgyretermes-bold.otf differ diff --git a/res/font/tex-gyre-termes/texgyretermes-bolditalic.otf b/res/font/tex-gyre-termes/texgyretermes-bolditalic.otf new file mode 100644 index 0000000..028b170 Binary files /dev/null and b/res/font/tex-gyre-termes/texgyretermes-bolditalic.otf differ diff --git a/res/font/tex-gyre-termes/texgyretermes-italic.otf b/res/font/tex-gyre-termes/texgyretermes-italic.otf new file mode 100644 index 0000000..935f9db Binary files /dev/null and b/res/font/tex-gyre-termes/texgyretermes-italic.otf differ diff --git a/res/font/tex-gyre-termes/texgyretermes-regular.otf b/res/font/tex-gyre-termes/texgyretermes-regular.otf new file mode 100644 index 0000000..20f26fb Binary files /dev/null and b/res/font/tex-gyre-termes/texgyretermes-regular.otf differ diff --git a/src/main.typ b/src/main.typ index 220a819..6e79dcd 100644 --- a/src/main.typ +++ b/src/main.typ @@ -30,7 +30,7 @@ size: prelude.to_pt(prelude.format.font-size), ligatures: prelude.format.ligratures, hyphenate: prelude.format.hyphenate, - alternates: prelude.format.ligratures, + alternates: false, discretionary-ligatures: prelude.format.ligratures, lang: prelude.format.language ) @@ -41,7 +41,7 @@ size: prelude.to_pt(prelude.format.font-size), ligatures: prelude.format.ligratures, hyphenate: prelude.format.hyphenate, - alternates: prelude.format.ligratures, + alternates: false, discretionary-ligatures: prelude.format.ligratures, lang: prelude.format.language ) @@ -51,7 +51,7 @@ size: prelude.to_pt(prelude.format.font-size) * 2, ligatures: prelude.format.ligratures, hyphenate: prelude.format.hyphenate, - alternates: prelude.format.ligratures, + alternates: false, discretionary-ligatures: prelude.format.ligratures, lang: prelude.format.language, weight: "regular" @@ -62,7 +62,7 @@ size: prelude.to_pt(prelude.format.font-size) * 1.5, ligatures: prelude.format.ligratures, hyphenate: prelude.format.hyphenate, - alternates: prelude.format.ligratures, + alternates: false, discretionary-ligatures: prelude.format.ligratures, lang: prelude.format.language, weight: "regular" @@ -73,7 +73,7 @@ size: prelude.to_pt(prelude.format.font-size) * 1.25, ligatures: prelude.format.ligratures, hyphenate: prelude.format.hyphenate, - alternates: prelude.format.ligratures, + alternates: false, discretionary-ligatures: prelude.format.ligratures, lang: prelude.format.language, weight: "regular"