From 744a7657e00e2948c5eebc9b657a811348a9db4b Mon Sep 17 00:00:00 2001 From: ruidajo Date: Tue, 9 Jul 2024 12:23:20 -0500 Subject: [PATCH 1/4] Updating the FontAwesome dependency and modifying the template const icons. --- lib.typ | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/lib.typ b/lib.typ index adebe2c..42f5c29 100644 --- a/lib.typ +++ b/lib.typ @@ -1,4 +1,4 @@ -#import "@preview/fontawesome:0.1.0": * +#import "@preview/fontawesome:0.2.1": * #import "@preview/linguify:0.4.0": * // const color @@ -9,13 +9,12 @@ // const icons #let linkedin-icon = box( - fa-icon("linkedin", fa-set: "Brands", fill: color-darknight), + fa-icon("linkedin", fill: color-darknight), ) #let github-icon = box( - fa-icon("github", fa-set: "Brands", fill: color-darknight), + fa-icon("github", fill: color-darknight), ) -// for some reason this icon doesn't work with fa-icon, so we use the local version -#let phone-icon = box(image("assets/icons/square-phone-solid.svg")) +#let phone-icon = box(fa-icon("square-phone-solid", fill: color-darknight)) #let email-icon = box(fa-icon("envelope", fill: color-darknight)) /// Helpers @@ -61,7 +60,7 @@ set box(height: 11pt) align(right + horizon)[ - #fa-icon("github", fa-set: "Brands", fill: color-darkgray) #link( + #fa-icon("github", fill: color-darkgray) #link( "https://github.com/" + github-path, github-path, ) From cf10c5303297e9bd58b5488a857b41990a35363b Mon Sep 17 00:00:00 2001 From: ruidajo Date: Tue, 9 Jul 2024 12:49:17 -0500 Subject: [PATCH 2/4] Fixing fontawesome square-phone icon setting. --- lib.typ | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib.typ b/lib.typ index 42f5c29..e0800f3 100644 --- a/lib.typ +++ b/lib.typ @@ -14,7 +14,7 @@ #let github-icon = box( fa-icon("github", fill: color-darknight), ) -#let phone-icon = box(fa-icon("square-phone-solid", fill: color-darknight)) +#let phone-icon = box(fa-icon("square-phone", fill: color-darknight)) #let email-icon = box(fa-icon("envelope", fill: color-darknight)) /// Helpers From 85e9faf8dc8e0812387107ad540bd6f0809aec15 Mon Sep 17 00:00:00 2001 From: Paul T Date: Tue, 9 Jul 2024 15:33:21 -0400 Subject: [PATCH 3/4] chore: remove (now) unused icon --- assets/icons/LICENSE.txt | 165 ---------------------------- assets/icons/square-phone-solid.svg | 1 - 2 files changed, 166 deletions(-) delete mode 100644 assets/icons/LICENSE.txt delete mode 100644 assets/icons/square-phone-solid.svg diff --git a/assets/icons/LICENSE.txt b/assets/icons/LICENSE.txt deleted file mode 100644 index 39e18e3..0000000 --- a/assets/icons/LICENSE.txt +++ /dev/null @@ -1,165 +0,0 @@ -Fonticons, Inc. (https://fontawesome.com) - --------------------------------------------------------------------------------- - -Font Awesome Free License - -Font Awesome Free is free, open source, and GPL friendly. You can use it for -commercial projects, open source projects, or really almost whatever you want. -Full Font Awesome Free license: https://fontawesome.com/license/free. - --------------------------------------------------------------------------------- - -# Icons: CC BY 4.0 License (https://creativecommons.org/licenses/by/4.0/) - -The Font Awesome Free download is licensed under a Creative Commons -Attribution 4.0 International License and applies to all icons packaged -as SVG and JS file types. - --------------------------------------------------------------------------------- - -# Fonts: SIL OFL 1.1 License - -In the Font Awesome Free download, the SIL OFL license applies to all icons -packaged as web and desktop font files. - -Copyright (c) 2023 Fonticons, Inc. (https://fontawesome.com) -with Reserved Font Name: "Font Awesome". - -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: -http://scripts.sil.org/OFL - -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. - --------------------------------------------------------------------------------- - -# Code: MIT License (https://opensource.org/licenses/MIT) - -In the Font Awesome Free download, the MIT license applies to all non-font and -non-icon files. - -Copyright 2023 Fonticons, Inc. - -Permission is hereby granted, free of charge, to any person obtaining a copy of -this software and associated documentation files (the "Software"), to deal in the -Software without restriction, including without limitation the rights to use, copy, -modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, -and to permit persons to whom the Software is furnished to do so, subject to the -following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, -INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A -PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT -HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE -SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - --------------------------------------------------------------------------------- - -# Attribution - -Attribution is required by MIT, SIL OFL, and CC BY licenses. Downloaded Font -Awesome Free files already contain embedded comments with sufficient -attribution, so you shouldn't need to do anything additional when using these -files normally. - -We've kept attribution comments terse, so we ask that you do not actively work -to remove them from files, especially code. They're a great way for folks to -learn about Font Awesome. - --------------------------------------------------------------------------------- - -# Brand Icons - -All brand icons are trademarks of their respective owners. The use of these -trademarks does not indicate endorsement of the trademark holder by Font -Awesome, nor vice versa. **Please do not use brand logos for any purpose except -to represent the company, product, or service to which they refer.** diff --git a/assets/icons/square-phone-solid.svg b/assets/icons/square-phone-solid.svg deleted file mode 100644 index 13fd107..0000000 --- a/assets/icons/square-phone-solid.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file From a6a6108caeb4b69de0fb40dccc0f94eed40403f9 Mon Sep 17 00:00:00 2001 From: Paul T Date: Tue, 9 Jul 2024 15:33:36 -0400 Subject: [PATCH 4/4] format: auto formatting --- lib.typ | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/lib.typ b/lib.typ index e0800f3..6184900 100644 --- a/lib.typ +++ b/lib.typ @@ -244,7 +244,10 @@ font: ("Roboto"), ) #if language == "zh" or language == "ja" [ - #text(accent-color, weight: "thin")[#author.firstname]#text(weight: "bold")[#author.lastname] + #text( + accent-color, + weight: "thin", + )[#author.firstname]#text(weight: "bold")[#author.lastname] ] else [ #text(accent-color, weight: "thin")[#author.firstname] #text(weight: "bold")[#author.lastname] @@ -511,7 +514,10 @@ font: ("Roboto"), ) #if language == "zh" or language == "ja" [ - #text(accent-color, weight: "thin")[#author.firstname]#text(weight: "bold")[#author.lastname] + #text( + accent-color, + weight: "thin", + )[#author.firstname]#text(weight: "bold")[#author.lastname] ] else [ #text(accent-color, weight: "thin")[#author.firstname] #text(weight: "bold")[#author.lastname] @@ -619,7 +625,10 @@ let letter-conclusion = { align(bottom)[ #pad(bottom: 2em)[ - #text(weight: "light")[#linguify("sincerely", from: lang_data)#sym.comma] \ + #text(weight: "light")[#linguify( + "sincerely", + from: lang_data, + )#sym.comma] \ #text(weight: "bold")[#author.firstname #author.lastname] \ \ #text(weight: "light", style: "italic")[ #linguify( "attached",