updated oldstandard.tex and makefile

diff --git a/makefile b/makefile
index 8f23d3d2512efbb78e26d065975c466045e39acb..a7b8032197156169557cea772cdacc534c75fd2b 100644 (file)
--- a/makefile
+++ b/makefile
@@ -1,31 +1,42 @@
 pkg := oldstandard
 pkg := oldstandard

-ver  := $(shell grep '\\edef\\pkgver' $(pkg).tex | grep -Eo '[0-9]?\.[0-9]?')
+ver  := $(shell grep '\\edef\\pkgver' $(pkg).tex | grep -Eo '[0-9]{1,}\.[0-9]{1,}[a-z]{,1}')

 TEXMFDIR := $(shell kpsewhich -expand-var='$$TEXMFHOME')
 HOMEDIR := $$HOME
 LOCALFONTDIR := $(HOMEDIR)/.local/share/fonts
 
 doc: local
 TEXMFDIR := $(shell kpsewhich -expand-var='$$TEXMFHOME')
 HOMEDIR := $$HOME
 LOCALFONTDIR := $(HOMEDIR)/.local/share/fonts
 
 doc: local

-       lualatex --shell-escape $(pkg).tex
-       biber $(pkg)
-       lualatex --shell-escape $(pkg).tex
-       lualatex --shell-escape $(pkg).tex
+       @echo "Building the documentation. Please wait..."
+       lualatex --shell-escape $(pkg).tex >/dev/null
+       biber $(pkg) >/dev/null
+       lualatex --shell-escape $(pkg).tex >/dev/null
+       lualatex --shell-escape $(pkg).tex >/dev/null
+       @echo "Removing OldStandard .otf files from $(LOCALFONTDIR)..."
+       rm -f $(LOCALFONTDIR)/OldStandard-*.otf
+       luaotfload-tool --update
+       @echo "Done."

 
 all: doc
 
 
 all: doc
 

-local: clean
+local:
+       @rm -f $(LOCALFONTDIR)/OldStandard-*.otf
+       @echo "Installing latest OldStandard .otf files in $(LOCALFONTDIR)..."

        cp otf/OldStandard-*.otf $(LOCALFONTDIR)/
        luaotfload-tool --update
        cp otf/OldStandard-*.otf $(LOCALFONTDIR)/
        luaotfload-tool --update

+       @echo "Done."

 
 package: doc
 
 package: doc

-       mkdir $(pkg)
-       cp *.{txt,md,tex,pdf} $(pkg)
-       cp otf/*.otf $(pkg)
-       tar czf $(pkg)-$(ver).tar.gz $(pkg)
+       mkdir $(pkg)-$(ver)
+       cp *.{txt,md,tex,pdf} $(pkg)-$(ver)
+       cp otf/*.otf $(pkg)-$(ver)
+       tar czf $(pkg)-$(ver).tar.gz $(pkg)-$(ver)
+       @echo "$(pkg)-$(ver).tar.gz has been created."

 
 clean:
 
 clean:

+       @echo "Removing OldStandard .otf files from $(LOCALFONTDIR)..."

        rm -f $(LOCALFONTDIR)/OldStandard-*.otf
        luaotfload-tool --update
        git clean -df
        pandoc README.md -o about.html
        rm -f $(LOCALFONTDIR)/OldStandard-*.otf
        luaotfload-tool --update
        git clean -df
        pandoc README.md -o about.html

+       @echo "Done."

 
 

-.PHONY: doc all local package clean prepare
+.PHONY: doc all local package clean

diff --git a/oldstandard.tex b/oldstandard.tex
index 722219f6f97cc3299de2a9b6a1372053bb8b83e8..e04428817453ae022ef046312f3823eeec9c99ae 100644 (file)
--- a/oldstandard.tex
+++ b/oldstandard.tex
@@ -138,13 +138,14 @@ Version 1.1. This license is available with a FAQ at:
 \label{sec:documentation}
 No documentation is associated with this release of \emph{Old
   Standard} as every item of the original extensive documentation
 \label{sec:documentation}
 No documentation is associated with this release of \emph{Old
   Standard} as every item of the original extensive documentation

-applies. The reader should refer to this documentation, edited by Bob
-Tennent:\icite{oldstandard}
+applies. The reader should refer to the documentation edited for CTAN
+by Bob Tennent:\icite{oldstandard}

 \begin{itemize}
 \item
   \href{http://mirrors.ctan.org/fonts/oldstandard/doc/oldstand-manual.pdf}%
   {Original manual (online version)}
 \begin{itemize}
 \item
   \href{http://mirrors.ctan.org/fonts/oldstandard/doc/oldstand-manual.pdf}%
   {Original manual (online version)}

-\item \href{oldstand-manual.pdf}{Original manual (local version)}
+\item \href{oldstand-manual.pdf}{Original manual (local version
+    included in {\TeX}Live)}

 \end{itemize}
 
 \section{History}
 \end{itemize}
 
 \section{History}