diff --git a/README.md b/README.md index 188c7ff..da810bf 100644 --- a/README.md +++ b/README.md @@ -90,7 +90,7 @@ $ make docker ### System Setup -If you use Arch Linux, you can install [this AUR package](https://aur.archlinux.org/packages/fontship) (prebuilt in [this repostiory](https://wiki.archlinux.org/index.php/Unofficial_user_repositories#alerque)). +If you use Arch Linux, you can install [this AUR package](https://aur.archlinux.org/packages/fontship) (prebuilt in [this repository](https://wiki.archlinux.org/index.php/Unofficial_user_repositories#alerque)). Otherwise to install and use locally from source, you’ll need some dependencies: @@ -99,7 +99,7 @@ Otherwise to install and use locally from source, you’ll need some dependencie * GNU `make` (4.2+) with corresponding autoconf tools, * Python 3 plus assorted modules, see *requirements.txt* file, * Rust tools including `cargo` and `rustc` to build the CLI, -* And a handfull of other font related CLI utilities, namely: `sfnt2woff-zopfli`, `psautohint`, `ttfautohint`, and `woff2_compress`. +* And a handful of other font related CLI utilities, namely: `sfnt2woff-zopfli`, `psautohint`, `ttfautohint`, and `woff2_compress`. To install the software to your computer, either clone this repository and run `./bootstrap.sh` or [download and extract the latest release](https://github.com/theleagueof/fontship/releases), then run: @@ -152,4 +152,4 @@ $ fontship make dist ### Versioning The font version setting in all generated fonts is determined by the tag on the git repository. -Version tags should conform to the `MAJOR.MINOR` format descriped by [openfv](https://github.com/openfv/openfv#3-version-number-semantics). +Version tags should conform to the `MAJOR.MINOR` format described by [openfv](https://github.com/openfv/openfv#3-version-number-semantics). diff --git a/rules/glyphs.mk b/rules/glyphs.mk index 5e46acc..1dfa543 100644 --- a/rules/glyphs.mk +++ b/rules/glyphs.mk @@ -22,12 +22,12 @@ $(shell rm -f $(_TMP)) %.designspace: %.glyphs echo MM $@ -# Glyphs -> Varibale OTF +# Glyphs -> Variable OTF $(BUILDDIR)/%-VF-variable.otf: $(SOURCEDIR)/%.glyphs | $(BUILDDIR) $(FONTMAKE) $(FONTMAKEFLAGS) -g $< -o variable-cff2 --output-path $@ -# Glyphs -> Varibale TTF +# Glyphs -> Variable TTF $(BUILDDIR)/%-VF-variable.ttf: $(SOURCEDIR)/%.glyphs | $(BUILDDIR) $(FONTMAKE) $(FONTMAKEFLAGS) -g $< -o variable --output-path $@ diff --git a/rules/rules.mk b/rules/rules.mk index 554ff23..39d6c74 100644 --- a/rules/rules.mk +++ b/rules/rules.mk @@ -279,7 +279,7 @@ $(BUILDDIR): mkdir -p $@ ifeq ($(PROJECT),Data) -$(warning We cannot read the Project’s name inside Docker. Please manually specify it by adding PROJECT='Name' as an agument to your command invocation) +$(warning We cannot read the Project’s name inside Docker. Please manually specify it by adding PROJECT='Name' as an argument to your command invocation) endif -include $(FONTSHIPDIR)/rules/$(CANONICAL).mk diff --git a/src/setup/mod.rs b/src/setup/mod.rs index a7936fa..1015e42 100644 --- a/src/setup/mod.rs +++ b/src/setup/mod.rs @@ -55,7 +55,7 @@ pub fn is_setup() -> Result { results.write().unwrap().push(ret); }); s.spawn(|_| { - let ret = is_make_exectuable().unwrap(); + let ret = is_make_executable().unwrap(); results.write().unwrap().push(ret); }); }); @@ -125,7 +125,7 @@ pub fn is_writable() -> Result { } /// Check if we can execute the system's `make` utility -pub fn is_make_exectuable() -> Result { +pub fn is_make_executable() -> Result { let status = FONTSHIPUI.new_check("setup-is-make-executable"); let ret = Exec::cmd("make") .arg("-v")