corrected some glitches, made the super Makefile inputpath aware

5 files changed, 56 insertions, 48 deletions

diff --git a/testing/Makefile b/testing/Makefile
index 5a3264a..dc03917 100644
--- a/testing/Makefile
+++ b/testing/Makefile
@@ -71,6 +71,9 @@ columns:
 extendedchars:
 	cd ./keyval/extendedchars; make all
 
+inputpath:
+	cd ./keyval/inputpath; make all
+
 numbering:
 	cd ./keyval/numbering; make all
 
diff --git a/testing/keyval/inputpath/Makefile b/testing/keyval/inputpath/Makefile
index 185c32c..fecef7a 100644
--- a/testing/keyval/inputpath/Makefile
+++ b/testing/keyval/inputpath/Makefile
@@ -31,7 +31,7 @@ inputpath_00.pdf: inputpath_00.tex hello.f90 listings.cfg
 
 inputpath_01.pdf: inputpath_00.tex hello.f90 listings.cfg
 
-inputpath_01.pdf: inputpath_01.tex hello.f90 ../../languages/fortran/senseless.f08 listings.cfg
+inputpath_02.pdf: inputpath_02.tex hello.f90 ../../languages/fortran/senseless.f08 listings.cfg
 	TEXINPUTS=./:../../languages/fortran/: pdflatex $<
 	
 	
diff --git a/testing/keyval/inputpath/inputpath_00.tex b/testing/keyval/inputpath/inputpath_00.tex
index b2d8010..8da9384 100644
--- a/testing/keyval/inputpath/inputpath_00.tex
+++ b/testing/keyval/inputpath/inputpath_00.tex
@@ -5,6 +5,7 @@
 
 \usepackage{listings}
 \lstset{style=colored}
+\usepackage{url}
 
 % reimplementation of the relevant commands
 \usepackage{inputpath}
@@ -12,31 +13,37 @@
 \begin{document}
 
 % testing, if \lst@MakePAth works correctly
+Printing path
 \makeatletter
-\lst@MakePath{../../languages/fortran/}
+\begin{description}
+  \item[with ] \lst@MakePath{../../languages/fortran/}
 
-\lst@MakePath{../../languages/fortran}
+    and
+  \item[without final slash:] \lst@MakePath{../../languages/fortran}
+\end{description}
 \makeatother
 
 \lstset{inputpath=../../languages/fortran}
 
-printing files from different directories, global inputpath is \url|../../languages/fortran|:
-
+Printing files from different directories, global inputpath is
+``\url|../../languages/fortran|'':
 \begin{enumerate}
-\item file is on global inputpath:
-\lstinputlisting[language=fortran, title=xxx]{senseless.f08}
-
-\item file is on local inputpath with the same value:
-\lstinputlisting[language=fortran, inputpath={../../languages/fortran}, title=yyy]{senseless.f08}
+  \item file is on global inputpath:%
+    \lstinputlisting[language=fortran]{senseless.f08}
 
-\item file is on local inputpath with the same value, testing trailing /:
-\lstinputlisting[language=fortran, inputpath={../../languages/fortran/}, title=zzz]{senseless.f08}
+  \item file is on local inputpath with the same value:%
+    \lstinputlisting[language=fortran,
+    inputpath={../../languages/fortran}]{senseless.f08}
 
-\item file is on local inputpath .:
-\lstinputlisting[language=fortran, inputpath={.}, title=xxx]{hello.f90}
+  \item file is on local inputpath with the same value, testing trailing
+    /:%
+    \lstinputlisting[language=fortran,
+    inputpath={../../languages/fortran/}]{senseless.f08}
 
-\item inputpath is empty:
-\lstinputlisting[language=fortran, inputpath={}, title=xxx]{hello.f90}
+  \item file is on local inputpath ``\url|.|'':%
+    \lstinputlisting[language=fortran, inputpath={.}]{hello.f90}
 
+  \item inputpath is empty:%
+    \lstinputlisting[language=fortran, inputpath={}]{hello.f90}
 \end{enumerate}
 \end{document}
diff --git a/testing/keyval/inputpath/inputpath_01.tex b/testing/keyval/inputpath/inputpath_01.tex
index ce38cf0..23f8d84 100644
--- a/testing/keyval/inputpath/inputpath_01.tex
+++ b/testing/keyval/inputpath/inputpath_01.tex
@@ -8,36 +8,31 @@
 
 \usepackage{url}
 
-% \usepackage{inputpath}
-
 \begin{document}
 
-% \makeatletter
-% \lst@MakePath{../../languages/fortran/}
-
-% \lst@MakePath{../../languages/fortran}
-
-% \makeatother
-
 \lstset{inputpath=../../languages/fortran}
 
-printing files from different directories, global inputpath is \url|../../languages/fortran|:
-
+Printing files from different directories, global \lstinline|inputpath| is
+``\url|../../languages/fortran|'':
 \begin{enumerate}
-\item file is on global inputpath:
-\lstinputlisting[language=fortran, title=xxx]{senseless.f08}
+  \item file is on global \lstinline|inputpath|:%
+    \lstinputlisting[language=fortran]{senseless.f08}
 
-\item file is on local inputpath with the same value:
-\lstinputlisting[language=fortran, inputpath={../../languages/fortran}, title=yyy]{senseless.f08}
+  \item file is on local \lstinline|inputpath| with the same value:
+    \lstinputlisting[language=fortran,
+    inputpath={../../languages/fortran}]{senseless.f08}
 
-\item file is on local inputpath with the same value, testing trailing /:
-\lstinputlisting[language=fortran, inputpath={../../languages/fortran/}, title=zzz]{senseless.f08}
+  \item file is on local \lstinline|inputpath| with the same value, testing
+    trailing ``/'':%
+    \lstinputlisting[language=fortran,
+    inputpath={../../languages/fortran/}]{senseless.f08}
 
-\item file is on local inputpath .:
-\lstinputlisting[language=fortran, inputpath={.}, title=xxx]{hello.f90}
+  \item file is on local \lstinline|inputpath| ``\url|.|'':%
+    \lstinputlisting[language=fortran, inputpath={.}]{hello.f90}
 
-\item inputpath is empty:
-\lstinputlisting[language=fortran, inputpath={}, title=xxx]{hello.f90}
+  \item \lstinline|inputpath| is empty, a file in the current directory
+    will be read:%
+    \lstinputlisting[language=fortran, inputpath={}]{hello.f90}
 
 \end{enumerate}
 \end{document}
diff --git a/testing/keyval/inputpath/inputpath_02.tex b/testing/keyval/inputpath/inputpath_02.tex
index 17a0024..6210458 100644
--- a/testing/keyval/inputpath/inputpath_02.tex
+++ b/testing/keyval/inputpath/inputpath_02.tex
@@ -8,22 +8,25 @@
 
 \usepackage{url}
 
-% \usepackage{inputpath}
-
 \begin{document}
 
-printing files from different directories x:
-
+Printing files from different directories partly defined by environments
+variables:
 \begin{enumerate}
-\item should be found, if \url|../../languages/fortran| belongs to \lstinline[language=bash]|TEXINPUTS|:
-\lstinputlisting[language=fortran]{senseless.f08}
+  \item should be found, if \url|../../languages/fortran| is part of
+    \lstinline[language=bash]|TEXINPUTS|:%
+    \lstinputlisting[language=fortran]{senseless.f08}
+
+  \item shouldn't be found, because \url|.| is part of
+    \lstinline[language=bash]|TEXINPUTS|, but the file doesn't reside
+    there:%
+    \lstinputlisting[language=fortran, inputpath={.}]{senseless.f08}
 
-\item shouldn't be found, because \url|.| belongs to \lstinline[language=bash]|TEXINPUTS|, but 
-the file doesn't reside there
-\lstinputlisting[language=fortran, inputpath={.}]{senseless.f08}
+  \item must be found, because \url|../../languages/fortran| is the path to
+    \url{senseless.f08}:%
+    \lstinputlisting[language=fortran,
+    inputpath={../../languages/fortran/}]{senseless.f08}
 
-\item must be found, because \url|../../languages/fortran| is the path to \url{senseless.f08}:
-\lstinputlisting[language=fortran, inputpath={../../languages/fortran/}, title=zzz]{senseless.f08}
 \end{enumerate}
 
 \end{document}