X-Git-Url: https://git.ladys.computer/OldStandard/blobdiff_plain/6dbd06c08b80333d045a849c5b785e7bb90012dd..refs/heads/upstream:/makefile?ds=sidebyside

diff --git a/makefile b/makefile
index 5e3e571..8a37d48 100644
--- a/makefile
+++ b/makefile
@@ -1,6 +1,8 @@
 pkg := oldstandard
-SHELL = bash
-ver  := $(shell grep '\\edef\\pkgver' $(pkg).tex | grep -Eo '[0-9]{1,}\.[0-9]{1,}[a-z]{,1}')
+SHELL = /usr/local/bin/bash
+PWD   = $(shell pwd)
+#ver  := $(shell grep '\\edef\\pkgver' $(pkg).tex | grep -Eo '[0-9]{1,}\.[0-9]{1,}[a-z]{,1}')
+ver := $(shell grep '\\edef\\pkgver' oldstandard.tex | egrep -o '[0-9]{1,}\.[0-9]{1,}\-?[a-z]?')
 TEXMFDIR := $(shell kpsewhich -expand-var='$$TEXMFHOME')
 HOMEDIR := $$HOME
 LOCALFONTDIR := $(HOMEDIR)/.local/share/fonts
@@ -11,9 +13,9 @@ doc: local
 	biber $(pkg) >/dev/null
 	lualatex --shell-escape $(pkg).tex >/dev/null
 	lualatex --shell-escape $(pkg).tex >/dev/null
-	@echo "Building font table..."
-	lualatex --shell-escape fonttable.tex >/dev/null
-	lualatex --shell-escape fonttable.tex >/dev/null
+	#@echo "Building font table..."
+	#lualatex --shell-escape fonttable.tex >/dev/null
+	#lualatex --shell-escape fonttable.tex >/dev/null
 	@echo "Removing OldStandard .otf files from $(LOCALFONTDIR)..."
 	rm -f $(LOCALFONTDIR)/OldStandard-*.otf
 	luaotfload-tool --update
@@ -26,21 +28,31 @@ local:
 	@echo "Installing latest OldStandard .otf files in $(LOCALFONTDIR)..."
 	cp otf/OldStandard-*.otf $(LOCALFONTDIR)/
 	luaotfload-tool --update
+	@echo "Installing .fontspec files..."
+	if [ ! -d "$(TEXMFDIR)/tex/latex/fontspec" ]; then \
+	mkdir -p $(TEXMFDIR)/tex/latex/fontspec; \
+	fi
+	cp fontspec/OldStandard.fontspec $(TEXMFDIR)/tex/latex/fontspec
 	@echo "Done."
 
 package: doc
 	mkdir $(pkg)-$(ver)
-	cp *.{txt,md,lua,tex,pdf} $(pkg)-$(ver)
+	cp *.{txt,md,tex,pdf} $(pkg)-$(ver)
 	cp otf/*.otf $(pkg)-$(ver)
+	cp fontspec/*.fontspec $(pkg)-$(ver)
 	tar czf $(pkg)-$(ver).tar.gz $(pkg)-$(ver)
 	@echo "$(pkg)-$(ver).tar.gz has been created."
 
+hal: clean
+	zip -Drq $(PWD)/$(pkg)-$(ver).zip *
+
 clean:
 	@echo "Removing OldStandard .otf files from $(LOCALFONTDIR)..."
 	rm -f $(LOCALFONTDIR)/OldStandard-*.otf
 	luaotfload-tool --update
+	@echo "Removing .fontspec files from local texmf dir..."
+	rm -f $(TEXMFDIR)/tex/latex/fontspec/OldStandard.fontspec
 	git clean -df
-	pandoc README.md -o about.html
 	@echo "Done."
 
 .PHONY: doc all local package clean