3 files changed, 69 insertions, 11 deletions

diff --git a/Makefile b/Makefile
index ebfc1bd..0a148ca 100644
--- a/Makefile
+++ b/Makefile
@@ -7,13 +7,13 @@ 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
+        lualatex --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
+        lualatex --shell-escape --recorder --interaction=nonstopmode $(NAME).dtx > /dev/null
+        lualatex --shell-escape --recorder --interaction=nonstopmode $(NAME).dtx > /dev/null
 clean:
-        rm -f $(NAME).{aux,fls,glo,gls,hd,idx,ilg,ind,ins,log,out,toc}
+        rm -f $(NAME).{aux,fls,glo,gls,hd,idx,ilg,ind,log,out,toc}
         rm -f *~
         rm -rf auto/
 #       rm -f $(NAME)_*.{bib,lua}
@@ -29,6 +29,11 @@ inst: uninst all
         cp $(NAME).sty $(UTREE)/tex/lualatex/$(NAME)
         cp $(NAME).lua $(UTREE)/tex/lualatex/$(NAME)
         cp $(NAME).pdf $(UTREE)/doc/lualatex/$(NAME)
+local: uninst
+        lualatex $(NAME).ins
+        mkdir -p $(UTREE)/{tex,source,doc}/lualatex/$(NAME)
+        cp $(NAME).sty $(UTREE)/tex/lualatex/$(NAME)
+        cp $(NAME).lua $(UTREE)/tex/lualatex/$(NAME)
 #install: all
 #       sudo mkdir -p $(LOCAL)/{tex,source,doc}/lualatex/$(NAME)
 #       sudo cp $(NAME).dtx $(LOCAL)/source/lualatex/$(NAME)
@@ -51,4 +56,3 @@ package: distclean all
         rm -rf tex/ source/ doc/
         tar czf $(NAME)-$(VERS).tar.gz $(NAME).tds.zip $(NAME)/
         rm -rf $(NAME)/
-
diff --git a/ekdosis.dtx b/ekdosis.dtx
index 672b228..3170f41 100644
--- a/ekdosis.dtx
+++ b/ekdosis.dtx
@@ -93,6 +93,14 @@ Running "make install" installs the files in the local TeX tree.
 \generate{
   \file{\jobname.sty}{\from{\jobname.dtx}{package}}
 }
+\nopreamble\nopostamble
+\usedir{tex/lualatex/ekdosis}
+\generate{
+  \file{\jobname.lua}{
+  \from{\jobname.dtx}{luapre}
+  \from{\jobname.dtx}{lua}
+  }
+}
 %</install>
 %<install>\endbatchfile
 %<*internal>
@@ -105,12 +113,6 @@ Running "make install" installs the files in the local TeX tree.
 \generate{
   \file{README.txt}{\from{\jobname.dtx}{readme}}
 }
-\usedir{tex/lualatex/ekdosis}
-\generate{
-  \file{ekdosis.lua}{
-    \from{\jobname.dtx}{luapre}
-    \from{\jobname.dtx}{lua}}
-}
 \ifx\fmtname\nameofplainTeX
   \expandafter\endbatchfile
 \else
diff --git a/ekdosis.ins b/ekdosis.ins
new file mode 100644
index 0000000..d88fc95
--- /dev/null
+++ b/ekdosis.ins
@@ -0,0 +1,52 @@
+\input docstrip.tex
+\keepsilent
+\askforoverwritefalse
+\preamble
+-------:| -----------------------------------------------------------------
+ekdosis:| Typesetting TEI xml compliant critical editions
+ Author:| Robert Alessi
+ E-mail:| alessi@robertalessi.net
+License:| Released under the GNU General Public License v3 or later
+    See:| http://www.gnu.org/licenses/
+
+This file is part of the `ekdosis' package
+
+ekdosis -- Typesetting TEI xml compliant critical editions
+Copyright (C) 2016  Robert Alessi
+
+Please send error reports and suggestions for improvements to Robert
+Alessi <alessi@robertalessi.net>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see
+<http://www.gnu.org/licenses/>.
+
+This work consists of the file ekdosis.dtx and a Makefile.
+Running "make" generates the derived files README, ekdosis.pdf and ekdosis.sty.
+Running "make inst" installs the files in the user's TeX tree.
+Running "make install" installs the files in the local TeX tree.
+\endpreamble
+
+\usedir{tex/lualatex/ekdosis}
+\generate{
+  \file{\jobname.sty}{\from{\jobname.dtx}{package}}
+}
+\nopreamble\nopostamble
+\usedir{tex/lualatex/ekdosis}
+\generate{
+  \file{\jobname.lua}{
+  \from{\jobname.dtx}{luapre}
+  \from{\jobname.dtx}{lua}
+  }
+}
+\endbatchfile