use local Old Standard to compile the doc. updated makefile

2 files changed, 11 insertions, 17 deletions

diff --git a/makefile b/makefile
index 1748e0a..c19afb8 100644
--- a/makefile
+++ b/makefile
@@ -2,23 +2,30 @@ pkg := oldstandard
 ver  := $(shell grep '\\edef\\pkgver' $(pkg).tex | grep -Eo '[0-9]?\.[0-9]?')
 TEXMFDIR := $(shell kpsewhich -expand-var='$$TEXMFHOME')
 HOMEDIR := $$HOME
+LOCALFONTDIR := $(HOMEDIR)/.local/share/fonts
 
-doc: clean
+doc: local
         lualatex --shell-escape $(pkg).tex
         biber $(pkg)
         lualatex --shell-escape $(pkg).tex
         lualatex --shell-escape $(pkg).tex
 
-all: clean doc
+all: doc
 
-package: clean doc
+local: clean
+        cp otf/OldStandard-*.otf $(LOCALFONTDIR)/
+        luaotfload-tool --update
+
+package: doc
         mkdir $(pkg)
         cp *.{txt,md,tex,pdf} $(pkg)
         cp otf/*.otf $(pkg)
         tar czf $(pkg)-$(ver).tar.gz $(pkg)
 
 clean:
+        rm -f $(LOCALFONTDIR)/OldStandard-*.otf
+        luaotfload-tool --update
         git clean -df
         pandoc README.md -o about.html
 
-.PHONY: doc all package clean
+.PHONY: doc all local package clean
diff --git a/oldstandard.tex b/oldstandard.tex
index f23b346..1e17bc7 100644
--- a/oldstandard.tex
+++ b/oldstandard.tex
@@ -31,19 +31,6 @@
 \usepackage[greek.ancient,english]{babel}
 \babeltags{grc = greek}
 
-% uncomment for testing:
-% \babelfont{rm}[Path = otf/,
-% ItalicFont={OldStandard-Italic.otf},
-% BoldFont={OldStandard-Bold.otf},
-% BoldItalicFont={OldStandard-BoldItalic.otf}]{OldStandard-Regular.otf}
-
-% \babelfont[greek]{rm}[Path = otf/,
-% RawFeature={+ss05;+ss06},
-% ItalicFont={OldStandard-Italic.otf},
-% BoldFont={OldStandard-Bold.otf},
-% BoldItalicFont={OldStandard-BoldItalic.otf}]{OldStandard-Regular.otf}
-
-% use the following two lines once Old Standard is installed:
 \babelfont{rm}{Old Standard}
 \babelfont[greek]{rm}[RawFeature={+ss05;+ss06}]{Old Standard}