use local Old Standard to compile the doc. updated makefile

diff --git a/makefile b/makefile
index 1748e0aaf2c021ea32a1d9f958dc30a7d3b5c0da..c19afb8dcab45d7e400178b986e14bebe102cf73 100644 (file)
--- 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 f23b346b4fd4679742a59e9096e00317eed7de5a..1e17bc7139e72d2da171d107d445a7551867f90e 100644 (file)
--- 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}