adapted makefiles. a few additions in the documentation. this is v1.0

5 files changed, 28 insertions, 31 deletions

diff --git a/Makefile b/Makefile
index 7d4e583..a270196 100644
--- a/Makefile
+++ b/Makefile
@@ -13,10 +13,15 @@ findopts := $(foreach ext,$(exts),-or -iname "*.$(ext)")
 
 all:    sty $(NAME).pdf
 
+testsamples:
+        if [ ! -d $(SAMPLES) ] ; \
+        then echo "$(SAMPLES)/ directory is needed. Aborting." && exit 1 ; \
+        fi
+
 sty: clean
         $(CMP) $(NAME).ins >/dev/null
 
-$(NAME).pdf: $(NAME).dtx
+$(NAME).pdf: testsamples $(NAME).dtx
         @ echo "Making the sample files first..."
         $(MAKE) --directory=$(SAMPLES)
         @ echo "Building the documentation of $(NAME)..."
@@ -33,7 +38,7 @@ $(NAME).pdf: $(NAME).dtx
 samples: clean sty
         $(MAKE) --directory=$(SAMPLES)
 
-clean:
+clean: testsamples
         rm -rf auto
         rm -f $(NAME).bib $(PWD)/TMP/*.bib
         rm -rf .backup
@@ -93,4 +98,5 @@ package: distclean all
         tar czf $(NAME)-$(VERS).tar.gz $(NAME).tds.zip $(NAME)/
         rm -rf $(NAME)/
 
-.PHONY: all clean distclean inst local uninst install uninstall zip package samples
+.SILENT: testsamples
+.PHONY: all clean distclean inst local uninst install uninstall zip package samples testsamples
diff --git a/README.md b/README.md
index f94c30f..8b54b9d 100644
--- a/README.md
+++ b/README.md
@@ -19,16 +19,6 @@ readings, translations or annotated borrowings between texts. It is
 published under the terms of the GNU General Public License (GPL)
 version 3.
 
-Notice to the Gentle Reader
-===========================
-The current state of this documentation covers the basics of
-`ekdosis`, namely what should be enough to start a new document and
-see how it works. v1.0 with a full documentation should be out by the
-end of July. Until then, there is a web page that can be accessed,
-<http://www.robertalessi.net/ekdosis>, with a mailing list that one can
-subscribe to and a section entitled “Literature” where one will find
-some slides and a paper submitted to a journal.
-
 License and Disclamer
 =====================
 ekdosis – Typesetting TEI xml Compliant Critical Editions
diff --git a/about.html b/about.html
index f83cfb3..3100f83 100644
--- a/about.html
+++ b/about.html
@@ -15,8 +15,6 @@
 </div>
 <h1 id="overview">Overview</h1>
 <p><code>ekdosis</code> is a LuaLaTeX package designed for multilingual critical editions. It can be used to typeset texts and different layers of critical notes in any direction accepted by LuaTeX. Texts can be arranged in running paragraphs or on facing pages, in any number of columns which in turn can be synchronized or not. In addition to printed texts, <code>ekdosis</code> can convert <code>.tex</code> source files so as to produce <code>TEI xml</code> compliant critical editions. Database-driven encoding under LaTeX then allows extraction of texts entered segment by segment according to various criteria: main edited text, variant readings, translations or annotated borrowings between texts. It is published under the terms of the GNU General Public License (GPL) version 3.</p>
-<h1 id="notice-to-the-gentle-reader">Notice to the Gentle Reader</h1>
-<p>The current state of this documentation covers the basics of <code>ekdosis</code>, namely what should be enough to start a new document and see how it works. v1.0 with a full documentation should be out by the end of July. Until then, there is a web page that can be accessed, <a href="http://www.robertalessi.net/ekdosis" class="uri">http://www.robertalessi.net/ekdosis</a>, with a mailing list that one can subscribe to and a section entitled “Literature” where one will find some slides and a paper submitted to a journal.</p>
 <h1 id="license-and-disclamer">License and Disclamer</h1>
 <p>ekdosis – Typesetting TEI xml Compliant Critical Editions</p>
 <p>Copyright ⓒ 2020 Robert Alessi</p>
diff --git a/ekdosis.dtx b/ekdosis.dtx
index ebbd2ee..5eb4844 100644
--- a/ekdosis.dtx
+++ b/ekdosis.dtx
@@ -582,20 +582,6 @@ along with this program.  If not, see
 %   \metapick[print]{titletext}
 % \end{tcolorbox}
 %
-% \begin{comment}
-%   \begin{tcolorbox}[title=Notice to the Gentle Reader]
-%     The current state of this documentation covers the basics of
-%     \pkg{ekdosis}, namely what should be enough to start a new
-%     document and see how it works. v1.0 with a full documentation
-%     should be out by the end of July. Until then, there is a web
-%     page that can be accessed,\footnote{%
-%     \url{http://www.robertalessi.net/ekdosis}} with a mailing list
-%     that one can subscribe to and a section entitled
-%     \enquote{Literature} where one will find some slides and a paper
-%     submitted to a journal.
-%   \end{tcolorbox}
-% \end{comment}
-% 
 % \tableofcontents
 % \listoflistings
 %
@@ -2608,6 +2594,15 @@ argument of the
 % can be used to enable modulo line numbering as described above.\\
 % \DescribeMacro{\resetlinenumber} \cs{resetlinenumber}\oarg{n} resets
 % the line number to one or to \emph{n} if specified.\\
+% \DescribeMacro{\linenumberfont}
+% \cs{renewcommand}|{\linenumberfont}|\marg{commands} can be used to
+% set the font used for the line numbers that are printed in the
+% margins. By default, the definition is
+% \cs{normalfont}\cs{footnotesize}.\\
+% \DescribeMacro{\linenumbersep} \cs{linenumbersep} is the distance
+% between the numbers and the margin. By default, this distance is set
+% to \unit[10]{pt}. It can be redefined like so:
+% \cs{setlength}\cs{linenumbersep}\marg{length}.\\
 % \DescribeMacro{\linelabel} \DescribeMacro{\lineref}
 % \cs{linelabel}\marg{label} sets a line label that can be referred to
 % with \cs{lineref}\marg{label}.
@@ -3463,6 +3458,7 @@ subtype="arabtex">'inna 'abI kAna mina
 % issue warnings if such labels contain invalid strings.
 %
 % \paragraph{\texttt{TEI xml} Export Settings}
+% \label{ref:setteixmlexport}
 % \DescribeMacro{\SetTEIxmlExport} \cs{SetTEIxmlExport}\marg{csv list
 % of options} can be used in the preamble or at any point of the
 % document, except inside environments set to receive an apparatus
@@ -3811,7 +3807,8 @@ Sample text with a \textcolor{red}{word} in red.
 % speech.\footnote{See
 % \url{https://tei-c.org/release/doc/tei-p5-doc/en/html/TS.html}.} The
 % technique applied below uses \cs{EnvtoTEI} conjointly with
-% \cs{SetTEIxmlExport}|{autopar=|\allowbreak|false}|:---
+% \cs{SetTEIxmlExport}|{autopar=|\allowbreak|false}| described above
+% \vpageref{ref:setteixmlexport}:---
 % 
 % \iffalse
 %<*example>
diff --git a/samples/Makefile b/samples/Makefile
index 49bb11b..8cb7a98 100644
--- a/samples/Makefile
+++ b/samples/Makefile
@@ -13,7 +13,7 @@ define dosamples
         $(CMP) --shell-escape $1 >/dev/null
 endef
 
-all:
+all: test
         cp ../ekdosis.{lua,sty} .
         $(foreach file,$(texsamples), $(call dosamples, $(file)))
         rm -rf auto
@@ -24,4 +24,10 @@ all:
         cp -p -r .backup/* .
         rm -rf .backup
 
+test:
+        if [ ! -e ../ekdosis.sty ] || [ ! -e ../ekdosis.lua ] ;\
+        then echo "This Makefile cannot be invoked but recursively. Aborting." && exit 1 ;\
+        fi
+
+.SILENT: test
 .PHONY: all