2 files changed, 66 insertions, 15 deletions

diff --git a/Makefile b/Makefile
index 496bc14..8709733 100644
--- a/Makefile
+++ b/Makefile
@@ -4,6 +4,12 @@ PWD   = $(shell pwd)
 VERS  = $(shell ltxfileinfo -v $(NAME).dtx|sed -e 's/^v//')
 LOCAL = $(shell kpsewhich --var-value TEXMFLOCAL)
 UTREE = $(shell kpsewhich --var-value TEXMFHOME)
+
+exts := md bib ins dtx html
+extsi := tex
+findopts := $(foreach ext,$(exts),-or -iname "*.$(ext)")
+findoptsi := $(foreach ext,$(extsi),-or -iname "*.$(ext)")
+
 all:    $(NAME).pdf
 #       test -e README.md || exit 0
 $(NAME).pdf: $(NAME).dtx
@@ -16,47 +22,91 @@ $(NAME).pdf: $(NAME).dtx
         if [ -f primary.idx ]; then texindy -M icite.xdy primary.idx >/dev/null; fi
         lualatex --shell-escape --recorder --interaction=nonstopmode $(NAME).dtx > /dev/null
         lualatex --shell-escape --recorder --interaction=nonstopmode $(NAME).dtx > /dev/null
+        if [ ! -d $(PWD)/TMP ]; then mkdir $(PWD)/TMP; fi
+        cp $(PWD)/samples/*.bib $(PWD)/TMP
+        lualatex --output-dir=$(PWD)/TMP --shell-escape samples/icite-biblatex.tex
+        lualatex --output-dir=$(PWD)/TMP --shell-escape samples/icite-biblatex.tex
+        texindy $(PWD)/TMP/pr-sources.idx
+        biber $(PWD)/TMP/icite-biblatex
+        lualatex --output-dir=$(PWD)/TMP --shell-escape samples/icite-biblatex.tex
+        lualatex --output-dir=$(PWD)/TMP --shell-escape samples/icite-biblatex.tex
+        lualatex --output-dir=$(PWD)/TMP --shell-escape samples/icite-nobiblatex.tex
+        lualatex --output-dir=$(PWD)/TMP --shell-escape samples/icite-nobiblatex.tex
+        texindy $(PWD)/TMP/pr-sources.idx
+        lualatex --output-dir=$(PWD)/TMP --shell-escape samples/icite-nobiblatex.tex
+        lualatex --output-dir=$(PWD)/TMP --shell-escape samples/icite-nobiblatex.tex
+        mv TMP/*.pdf samples/
+
+samples:
+        if [ ! -d $(PWD)/TMP ]; then mkdir $(PWD)/TMP; fi
+        cp $(PWD)/samples/*.bib $(PWD)/TMP
+        lualatex --output-dir=$(PWD)/TMP --shell-escape samples/icite-biblatex.tex
+        lualatex --output-dir=$(PWD)/TMP --shell-escape samples/icite-biblatex.tex
+        texindy $(PWD)/TMP/pr-sources.idx
+        biber $(PWD)/TMP/icite-biblatex
+        lualatex --output-dir=$(PWD)/TMP --shell-escape samples/icite-biblatex.tex
+        lualatex --output-dir=$(PWD)/TMP --shell-escape samples/icite-biblatex.tex
+        lualatex --output-dir=$(PWD)/TMP --shell-escape samples/icite-nobiblatex.tex
+        lualatex --output-dir=$(PWD)/TMP --shell-escape samples/icite-nobiblatex.tex
+        texindy $(PWD)/TMP/pr-sources.idx
+        lualatex --output-dir=$(PWD)/TMP --shell-escape samples/icite-nobiblatex.tex
+        lualatex --output-dir=$(PWD)/TMP --shell-escape samples/icite-nobiblatex.tex
+        mv TMP/*.pdf samples/
+
 lualatex:
         lualatex --shell-escape --recorder --interaction=batchmode $(NAME).dtx >/dev/null
+
 clean: lualatex
-        rm -f $(NAME).{aux,fls,glo,gls,hd,idx,ilg,ind,log,out,toc,xdy,listing,bcf,bib,bbl,blg,run.xml}
-        rm -f loccit.* primary.*
-        rm -f *~
-        rm -rf auto/
-distclean: clean uninst
-        rm -rf _minted-*
-        rm -f $(NAME).{pdf,sty}
-        rm -f *.zip *.tar.gz
+        rm -f $(NAME).bib $(PWD)/TMP/*.bib
+        rm -rf .backup
+        find -iname "*~" -or -iname "*.pdf" | xargs rm -rf
+        find ./* -type f -iname "Makefile" $(findopts) > ls-R
+        find ./* -type f -iname "samples/*" $(findoptsi) >> ls-R
+        rsync -avPr --files-from=ls-R . .backup
+        rm -rf *
+        cp -p -r .backup/* .
+        rm -rf .backup
         pandoc -s README.md -o about.html
+
+distclean: clean uninst
+
 inst: uninst all
         mkdir -p $(UTREE)/{tex,source,doc}/latex/$(NAME)
         cp $(NAME).dtx $(UTREE)/source/latex/$(NAME)
         cp $(NAME).sty $(UTREE)/tex/latex/$(NAME)
         cp $(NAME).pdf $(UTREE)/doc/latex/$(NAME)
+
 local: uninst
         lualatex $(NAME).ins
         mkdir -p $(UTREE)/{tex,source,doc}/latex/$(NAME)
         cp $(NAME).sty $(UTREE)/tex/latex/$(NAME)
+
 uninst:
         rm -rf $(UTREE)/{tex,source,doc}/latex/$(NAME)
+
 install: all
         sudo mkdir -p $(LOCAL)/{tex,source,doc}/latex/$(NAME)
         sudo cp $(NAME).dtx $(LOCAL)/source/latex/$(NAME)
         sudo cp $(NAME).sty $(LOCAL)/tex/latex/$(NAME)
         sudo cp $(NAME).pdf $(LOCAL)/doc/latex/$(NAME)
+
 uninstall:
         rm -rf $(LOCAL)/{tex,source,doc}/latex/$(NAME)
+
 zip: all
         ln -sf . $(NAME)
-        zip -Drq $(PWD)/$(NAME)-$(VERS).zip $(NAME)/{README.md,$(NAME).{pdf,dtx,ins}}
+        zip -Drq $(PWD)/$(NAME)-$(VERS).zip $(NAME)/{samples,README.md,$(NAME).{pdf,dtx,ins}}
         rm $(NAME)
+
 package: distclean all
         mkdir $(NAME)/
         cp Makefile README.md $(NAME).{dtx,ins,pdf} $(NAME)/
+        cp -r samples/ $(NAME)/
         mkdir -p tex/latex/$(NAME)/
         cp $(NAME).sty tex/latex/$(NAME)/
         mkdir -p doc/latex/$(NAME)/
         cp $(NAME).pdf doc/latex/$(NAME)/
+        cp -r samples/ doc/latex/$(NAME)/
         mkdir -p source/latex/$(NAME)/
         cp Makefile README.md $(NAME).{dtx,ins} source/latex/$(NAME)/
         zip -r $(NAME).tds.zip tex doc source
@@ -64,4 +114,4 @@ package: distclean all
         tar czf $(NAME)-$(VERS).tar.gz $(NAME).tds.zip $(NAME)/
         rm -rf $(NAME)/
 
-.PHONY: all lualatex clean distclean inst local uninst install uninstall zip package
+.PHONY: all lualatex clean distclean inst local uninst install uninstall zip package samples
diff --git a/icite.dtx b/icite.dtx
index 453da25..6415227 100644
--- a/icite.dtx
+++ b/icite.dtx
@@ -188,7 +188,7 @@ Running "make install" installs the files in the local TeX tree.
 %<package>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
 %<package>\ProvidesPackage{icite}
 %<*package>
-    [2019/03/07 v1.00 Make Indices locorum citatorum]
+    [2019/03/12 v1.1 Make Indices locorum citatorum]
 %</package>
 %<*driver>
 \documentclass{ltxdoc}
@@ -416,7 +416,7 @@ Running "make install" installs the files in the local TeX tree.
 %</driver>
 % \fi
 %
-% \CheckSum{0}
+% \CheckSum{316}
 %
 % \CharacterTable
 %  {Upper-case    \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
@@ -475,7 +475,7 @@ Running "make install" installs the files in the local TeX tree.
 % \icitetableofcontents
 % \normalsize
 %
-%\changes{v1.00}{2019/03/07}{First public release}
+% \changes{v1.00}{2019/03/07}{First public release}
 %
 % \begin{abstract}
 %   \package{icite} is designed to produce from \hologo{BibTeX} or
@@ -599,6 +599,7 @@ Running "make install" installs the files in the local TeX tree.
 % passages cited indexed in a separate index named |loccit|.
 %
 % \DescribeOption{nobibengine}\NEWfeature{v1.1}
+% \changes{v1.1}{2019/03/12}{New global option \texttt{nobibengine}}%
 % |nobibengine|$=$|true|\verb+|+|false|\hfill%
 % \tcboxverb{Default: not set}\\
 % This named argument does not need a value as it defaults to |true|
@@ -629,7 +630,7 @@ Running "make install" installs the files in the local TeX tree.
   % passages in a separate index named 'loccit':
   \usepackage[citecmd=autocite, defaultindex]{icite}
   % note that the .bib file must be stripped of its extension:
-  \usebib{bibliography} % that is: load bibliography.bib
+  \bibinput{bibliography} % that is: load bibliography.bib
 \end{code}
 % \iffalse
 %</example>
@@ -736,7 +737,7 @@ Running "make install" installs the files in the local TeX tree.
   % passages in a separate index named 'loccit':
   \usepackage[citecmd=autocite, defaultindex]{icite}
   % load bibliography.bib
-  \usebib{bibliography}
+  \bibinput{bibliography}
 
  % load biblatex (with oxnotes, \autocite acts as \footcite)
  \usepackage[style=oxnotes]{biblatex}