added new option 'sep' in \DeclareApparatus; new variable CMP in Makefile

1 files changed, 5 insertions, 4 deletions

diff --git a/Makefile b/Makefile
index 6449ff6..e4e89a2 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,6 @@
 NAME  = ekdosis
 SHELL = bash
+CMP   = lualatex-dev
 PWD   = $(shell pwd)
 VERS  = $(shell ltxfileinfo -v $(NAME).dtx|sed -e 's/^v//')
 LOCAL = $(shell kpsewhich --var-value TEXMFLOCAL)
@@ -7,11 +8,11 @@ UTREE = $(shell kpsewhich --var-value TEXMFHOME)
 all:    $(NAME).pdf
         test -e README.txt && mv README.txt README || exit 0
 $(NAME).pdf: $(NAME).dtx
-        lualatex --shell-escape -recorder -interaction=batchmode $(NAME).dtx >/dev/null
+        $(CMP) --shell-escape -recorder -interaction=batchmode $(NAME).dtx >/dev/null
         if [ -f $(NAME).glo ]; then makeindex -q -s gglo.ist -o $(NAME).gls $(NAME).glo; fi
         if [ -f $(NAME).idx ]; then makeindex -q -s gind.ist -o $(NAME).ind $(NAME).idx; fi
-        lualatex --shell-escape --recorder --interaction=nonstopmode $(NAME).dtx > /dev/null
-        lualatex --shell-escape --recorder --interaction=nonstopmode $(NAME).dtx > /dev/null
+        $(CMP) --shell-escape --recorder --interaction=nonstopmode $(NAME).dtx > /dev/null
+        $(CMP) --shell-escape --recorder --interaction=nonstopmode $(NAME).dtx > /dev/null
 clean:
         rm -f $(NAME).{aux,fls,glo,gls,hd,idx,ilg,ind,log,out,toc,pyg}
         rm -f *~
@@ -30,7 +31,7 @@ inst: uninst all
         cp $(NAME).lua $(UTREE)/tex/lualatex/$(NAME)
         cp $(NAME).pdf $(UTREE)/doc/lualatex/$(NAME)
 local: uninst
-        lualatex $(NAME).ins
+        $(CMP) $(NAME).ins
         mkdir -p $(UTREE)/{tex,source,doc}/lualatex/$(NAME)
         cp $(NAME).sty $(UTREE)/tex/lualatex/$(NAME)
         cp $(NAME).lua $(UTREE)/tex/lualatex/$(NAME)