5 files changed, 40 insertions, 209 deletions

diff --git a/Makefile b/Makefile
index e06046e..63e0b26 100644
--- a/Makefile
+++ b/Makefile
@@ -4,6 +4,7 @@ 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)
+CMP = lualatex-dev
 
 exts := md bib ins dtx html
 texsamples := $(basename $(wildcard $(PWD)/samples/*.tex))
@@ -23,9 +24,13 @@ define dosamples
         lualatex --output-dir=$(PWD)/TMP --shell-escape $1 >/dev/null
 endef
 
-all:    $(NAME).pdf
+sty: clean
+        $(CMP) $(NAME).ins
+
+all:    clean sty $(NAME).pdf
 #       test -e README.md || exit 0
-$(NAME).pdf: $(NAME).dtx
+
+$(NAME).pdf: clean sty $(NAME).dtx
         @ echo "Make documentation..."
         lualatex --shell-escape --recorder --interaction=batchmode $(NAME).dtx >/dev/null
         biber $(NAME) >/dev/null
@@ -42,7 +47,7 @@ $(NAME).pdf: $(NAME).dtx
         $(foreach file,$(texsamples), $(call dosamples, $(file)))
         mv TMP/*.pdf samples/
 
-samples:
+samples: clean sty
         if [ ! -d $(PWD)/TMP ]; then mkdir $(PWD)/TMP; fi
         cp $(PWD)/samples/*.bib $(PWD)/TMP
         $(foreach file,$(texsamples), $(call dosamples, $(file)))
@@ -51,7 +56,7 @@ samples:
 lualatex:
         lualatex --shell-escape --recorder --interaction=batchmode $(NAME).dtx >/dev/null
 
-clean: lualatex
+clean:
         rm -f $(NAME).bib $(PWD)/TMP/*.bib
         rm -rf .backup
         find -iname "*~" -or -iname "*.pdf" | xargs rm -rf
@@ -95,7 +100,7 @@ zip: all
 
 package: distclean all
         mkdir $(NAME)/
-        cp Makefile README.md $(NAME).{dtx,pdf} $(NAME)/
+        cp Makefile README.md $(NAME).{ins,dtx,pdf} $(NAME)/
         cp -r samples/ $(NAME)/
         mkdir -p tex/latex/$(NAME)/
         cp $(NAME).sty tex/latex/$(NAME)/
diff --git a/README.md b/README.md
index a96df41..c70816e 100644
--- a/README.md
+++ b/README.md
@@ -46,9 +46,7 @@ This release of icite consists of the following source files:
 
 -   `icite.dtx`
 
--   `icite.ins` (As this file can be generated from `icite.dtx`, it is
-    not included in CTAN repository, but it is included in the git
-    repository mentioned below for easier installation.)
+-   `icite.ins`
 
 -   `Makefile`
 
@@ -66,14 +64,10 @@ a letter to Creative Commons, PO Box 1866, Mountain View, CA 94042, USA.
 Installation
 ============
 
-1.  If `icite` was downloaded from CTAN, run `'lualatex --shell-escape
-    icite.dtx'` to produce the `icite.sty` file.
-
-    If `icite` was downloaded from the git repository mentioned above,
-    Run `'latex icite.ins'` to produce the `icite.sty` file.
+1.  Run `'latex icite.ins'` to produce the `icite.sty` file.
 
 2.  To finish the installation you have to move the `icite.sty` file into
-    a directory where LaTeX can find them. See the FAQ on `texfaq.org`
+    a directory where LaTeX can find it. See the FAQ on `texfaq.org`
     at <https://texfaq.org/FAQ-inst-wlcf> for more on this.
 
 Development, Git Repository
diff --git a/about.html b/about.html
index bcba576..508859e 100644
--- a/about.html
+++ b/about.html
@@ -30,7 +30,7 @@
 <p>This release of icite consists of the following source files:</p>
 <ul>
 <li><p><code>icite.dtx</code></p></li>
-<li><p><code>icite.ins</code> (As this file can be generated from <code>icite.dtx</code>, it is not included in CTAN repository, but it is included in the git repository mentioned below for easier installation.)</p></li>
+<li><p><code>icite.ins</code></p></li>
 <li><p><code>Makefile</code></p></li>
 </ul>
 <h2 id="license-applicable-to-the-documentation">License applicable to the documentation</h2>
@@ -38,9 +38,8 @@
 <p>The documentation file <code>icite.pdf</code> that is generated from the <code>icite.dtx</code> source file is licensed under the Creative Commons Attribution-ShareAlike 4.0 International License. To view a copy of this license, visit <a href="http://creativecommons.org/licenses/by-sa/4.0/" class="uri">http://creativecommons.org/licenses/by-sa/4.0/</a> or send a letter to Creative Commons, PO Box 1866, Mountain View, CA 94042, USA.</p>
 <h1 id="installation">Installation</h1>
 <ol style="list-style-type: decimal">
-<li><p>If <code>icite</code> was downloaded from CTAN, run <code>'lualatex --shell-escape icite.dtx'</code> to produce the <code>icite.sty</code> file.</p>
-<p>If <code>icite</code> was downloaded from the git repository mentioned above, Run <code>'latex icite.ins'</code> to produce the <code>icite.sty</code> file.</p></li>
-<li><p>To finish the installation you have to move the <code>icite.sty</code> file into a directory where LaTeX can find them. See the FAQ on <code>texfaq.org</code> at <a href="https://texfaq.org/FAQ-inst-wlcf" class="uri">https://texfaq.org/FAQ-inst-wlcf</a> for more on this.</p></li>
+<li><p>Run <code>'latex icite.ins'</code> to produce the <code>icite.sty</code> file.</p></li>
+<li><p>To finish the installation you have to move the <code>icite.sty</code> file into a directory where LaTeX can find it. See the FAQ on <code>texfaq.org</code> at <a href="https://texfaq.org/FAQ-inst-wlcf" class="uri">https://texfaq.org/FAQ-inst-wlcf</a> for more on this.</p></li>
 </ol>
 <h1 id="development-git-repository">Development, Git Repository</h1>
 <h2 id="browse-the-code">Browse the code</h2>
diff --git a/icite.dtx b/icite.dtx
index d89d012..6bd98e8 100644
--- a/icite.dtx
+++ b/icite.dtx
@@ -1,189 +1,23 @@
 % \iffalse meta-comment
-% vim: textwidth=75
-%<*internal>
-\iffalse
-%</internal>
-%<*readme>
----
-author:
-- Robert Alessi
-title: 'The icite package – README file'
----
-
-Overview
-========
-
-`icite` is designed to produce from BibTeX or BibLaTeX bibliographical
-databases the different indices of authors and works cited which are
-called _indices locorum citatorum_. It relies on a specific
-`\icite` command and can operate with either BibTeX or BibLaTeX.
-
-License and disclamer
-=====================
-
-icite – Indices locorum citatorum
-
-Copyright ⓒ 2019--2020 Robert Alessi
-
-Please send error reports and suggestions for improvements to Robert
-Alessi:
-
--   email: <alessi@robertalessi.net>
-
--   website: <http://www.robertalessi.net/icite>
-
--   comments, feature requests, bug reports:
-    <https://gitlab.com/ralessi/icite/issues>
-
-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 release of icite consists of the following source files:
-
--   `icite.dtx`
-
--   `icite.ins` (As this file can be generated from `icite.dtx`, it is
-    not included in CTAN repository, but it is included in the git
-    repository mentioned below for easier installation.)
-
--   `Makefile`
-
-License applicable to the documentation 
----------------------------------------
-
-Copyright ⓒ 2019--2020 Robert Alessi
-
-The documentation file `icite.pdf` that is generated from the
-`icite.dtx` source file is licensed under the Creative Commons
-Attribution-ShareAlike 4.0 International License. To view a copy of this
-license, visit <http://creativecommons.org/licenses/by-sa/4.0/> or send
-a letter to Creative Commons, PO Box 1866, Mountain View, CA 94042, USA.
-
-Installation 
-============
-
-1.  If `icite` was downloaded from CTAN, run `'lualatex --shell-escape
-    icite.dtx'` to produce the `icite.sty` file.
-
-    If `icite` was downloaded from the git repository mentioned above,
-    Run `'latex icite.ins'` to produce the `icite.sty` file.
-
-2.  To finish the installation you have to move the `icite.sty` file into
-    a directory where LaTeX can find them. See the FAQ on `texfaq.org`
-    at <https://texfaq.org/FAQ-inst-wlcf> for more on this.
-
-
-Development, Git Repository 
-===========================
-
-Browse the code 
----------------
-
-You can browse icite repository on the web:
-<http://git.robertalessi.net/icite>
-
-From this page, you can download all the releases of `icite`. For
-instructions on how to install `icite`, please see above.
-
-Comments, Feature requests, Bug Reports 
----------------------------------------
-
-<https://gitlab.com/ralessi/icite/issues>
-
-Download the repository 
------------------------
-
-`icite` development is facilitated by git, a distributed version
-control system. You will need to install git (most GNU/Linux
-distributions package it in their repositories).
-
-Use this command to download the repository
-
-    git clone http://git.robertalessi.net/icite
-
-A new directory named icite will have been created, containing
-`icite`.
-
-Git hosting 
------------
-
-Make an account on <https://gitlab.com> and navigate (while logged in)
-to <https://gitlab.com/ralessi/icite>. Click *Fork* and you will
-have in your account your own repository of `icite` where you will
-be able to make whatever changes you like to.
-
-%</readme>
-%<*internal>
-\fi
-\def\nameofplainTeX{plain}
-\ifx\fmtname\nameofplainTeX\else
-  \expandafter\begingroup
-\fi
-%</internal>
-%<*install>
-\input docstrip.tex
-\keepsilent
-\askforoverwritefalse
-\preamble
-
-Copyright (C) 2019-2020 by Robert Alessi <alessi@robertalessi.net>
-
-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 icite.dtx, icite.ins and a Makefile.
-Running "make" generates the derived files README.md, icite.pdf and icite.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/latex/icite}
-\generate{
-  \file{\jobname.sty}{\from{\jobname.dtx}{package}}
-}
-%</install>
-%<install>\endbatchfile
-%<*internal>
-\usedir{source/latex/icite}
-\generate{
-  \file{\jobname.ins}{\from{\jobname.dtx}{install}}
-}
-\nopreamble\nopostamble
-\usedir{doc/latex/icite}
-\generate{
-  \file{README.md}{\from{\jobname.dtx}{readme}}
-}
-\ifx\fmtname\nameofplainTeX
-  \expandafter\endbatchfile
-\else
-  \expandafter\endgroup
-\fi
-%</internal>
+% icite -- Indices locorum citatorum
+% Copyright (C) 2016--2020  Robert Alesssi
+%
+% 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/>.
 % \fi
 %
 % \iffalse
diff --git a/icite.ins b/icite.ins
index 9b4c415..b56c742 100644
--- a/icite.ins
+++ b/icite.ins
@@ -1,10 +1,6 @@
 %%
-%% This is file `icite.ins',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% icite.dtx  (with options: `install')
+%% icite -- Indices locorum citatorum
+%% Copyright (C) 2016--2020  Robert Alesssi
 %% 
 %% Copyright (C) 2019-2020 by Robert Alessi <alessi@robertalessi.net>
 %% 
@@ -35,6 +31,9 @@
 \askforoverwritefalse
 \preamble
 
+icite -- Indices locorum citatorum
+Copyright (C) 2016--2020  Robert Alesssi
+
 Copyright (C) 2019-2020 by Robert Alessi <alessi@robertalessi.net>
 
 Please send error reports and suggestions for improvements to Robert