Merge branch 'AndreasFMueller:master' into master

6 files changed, 22 insertions, 11 deletions

diff --git a/buch/papers/common/Makefile.inc b/buch/papers/common/Makefile.inc
index d32c902..eb8b8a7 100644
--- a/buch/papers/common/Makefile.inc
+++ b/buch/papers/common/Makefile.inc
@@ -11,7 +11,7 @@ PAPERFILES = \
 	papers/000template/main.tex \
 	papers/lambertw/main.tex \
 	papers/fm/main.tex \
-	papers/nlwave/main.tex \
+	papers/parzyl/main.tex \
 	papers/fresnel/main.tex \
 	papers/kreismembran/main.tex \
 	papers/sturmliouville/main.tex \
@@ -24,6 +24,7 @@ PAPERFILES = \
 	papers/kugel/main.tex \
 	papers/hermite/main.tex \
 	papers/ellfilter/main.tex \
+	papers/dreieck/main.tex \
 	
 buch1-blx.bbl:	buch1-blx.aux
 	bibtex buch1-blx
@@ -76,6 +77,9 @@ buch16-blx.bbl:	buch16-blx.aux
 buch17-blx.bbl:	buch17-blx.aux
 	bibtex buch17-blx
 
+buch18-blx.bbl:	buch18-blx.aux
+	bibtex buch18-blx
+
 BLXFILES = buch.bbl \
 	buch1-blx.bbl \
 	buch2-blx.bbl \
@@ -94,12 +98,13 @@ BLXFILES = buch.bbl \
 	buch15-blx.bbl \
 	buch16-blx.bbl \
 	buch17-blx.bbl \
+	buch18-blx.bbl \
 
 PAPER_DIRECTORIES = \
 	000template \
 	lambertw \
 	fm \
-	nlwave \
+	parzyl \
 	fresnel \
 	kreismembran \
 	sturmliouville \
@@ -112,12 +117,13 @@ PAPER_DIRECTORIES = \
 	kugel \
 	hermite \
 	ellfilter \
+	dreieck \
 	
 PAPER_MAKEFILEINC = \
 	papers/000template/Makefile.inc \
 	papers/lambertw/Makefile.inc \
 	papers/fm/Makefile.inc \
-	papers/nlwave/Makefile.inc \
+	papers/parzyl/Makefile.inc \
 	papers/fresnel/Makefile.inc \
 	papers/kreismembran/Makefile.inc \
 	papers/sturmliouville/Makefile.inc \
@@ -130,4 +136,5 @@ PAPER_MAKEFILEINC = \
 	papers/kugel/Makefile.inc \
 	papers/hermite/Makefile.inc \
 	papers/ellfilter/Makefile.inc \
+	papers/dreieck/Makefile.inc \
 	
diff --git a/buch/papers/common/addbibresources.tex b/buch/papers/common/addbibresources.tex
index be4802c..6e354b5 100644
--- a/buch/papers/common/addbibresources.tex
+++ b/buch/papers/common/addbibresources.tex
@@ -6,7 +6,7 @@
 \addbibresource{papers/000template/references.bib}
 \addbibresource{papers/lambertw/references.bib}
 \addbibresource{papers/fm/references.bib}
-\addbibresource{papers/nlwave/references.bib}
+\addbibresource{papers/parzyl/references.bib}
 \addbibresource{papers/fresnel/references.bib}
 \addbibresource{papers/kreismembran/references.bib}
 \addbibresource{papers/sturmliouville/references.bib}
@@ -19,3 +19,4 @@
 \addbibresource{papers/kugel/references.bib}
 \addbibresource{papers/hermite/references.bib}
 \addbibresource{papers/ellfilter/references.bib}
+\addbibresource{papers/dreieck/references.bib}
diff --git a/buch/papers/common/addpackages.tex b/buch/papers/common/addpackages.tex
index 00e564a..31f7455 100644
--- a/buch/papers/common/addpackages.tex
+++ b/buch/papers/common/addpackages.tex
@@ -6,7 +6,7 @@
 \input{papers/000template/packages.tex}
 \input{papers/lambertw/packages.tex}
 \input{papers/fm/packages.tex}
-\input{papers/nlwave/packages.tex}
+\input{papers/parzyl/packages.tex}
 \input{papers/fresnel/packages.tex}
 \input{papers/kreismembran/packages.tex}
 \input{papers/sturmliouville/packages.tex}
@@ -19,3 +19,4 @@
 \input{papers/kugel/packages.tex}
 \input{papers/hermite/packages.tex}
 \input{papers/ellfilter/packages.tex}
+\input{papers/dreieck/packages.tex}
diff --git a/buch/papers/common/addpapers.tex b/buch/papers/common/addpapers.tex
index 6327dc3..eb353d7 100644
--- a/buch/papers/common/addpapers.tex
+++ b/buch/papers/common/addpapers.tex
@@ -3,10 +3,9 @@
 %
 % (c) 2020 Prof Dr Andreas Müller, Hochschule Rapperswil
 %
-\input{papers/000template/main.tex}
 \input{papers/lambertw/main.tex}
 \input{papers/fm/main.tex}
-\input{papers/nlwave/main.tex}
+\input{papers/parzyl/main.tex}
 \input{papers/fresnel/main.tex}
 \input{papers/kreismembran/main.tex}
 \input{papers/sturmliouville/main.tex}
@@ -19,3 +18,4 @@
 \input{papers/kugel/main.tex}
 \input{papers/hermite/main.tex}
 \input{papers/ellfilter/main.tex}
+\input{papers/dreieck/main.tex}
diff --git a/buch/papers/common/includes.inc b/buch/papers/common/includes.inc
index e5b4a63..3e064d9 100644
--- a/buch/papers/common/includes.inc
+++ b/buch/papers/common/includes.inc
@@ -1,7 +1,7 @@
 include papers/000template/Makefile.inc
 include papers/lambertw/Makefile.inc
 include papers/fm/Makefile.inc
-include papers/nlwave/Makefile.inc
+include papers/parzyl/Makefile.inc
 include papers/fresnel/Makefile.inc
 include papers/kreismembran/Makefile.inc
 include papers/sturmliouville/Makefile.inc
@@ -14,12 +14,13 @@ include papers/kra/Makefile.inc
 include papers/kugel/Makefile.inc
 include papers/hermite/Makefile.inc
 include papers/ellfilter/Makefile.inc
+include papers/dreieck/Makefile.inc
 
 TEXFILES = \
 	$(dependencies-000template) \
 	$(dependencies-lambertw) \
 	$(dependencies-fm) \
-	$(dependencies-nlwave) \
+	$(dependencies-parzyl) \
 	$(dependencies-fresnel) \
 	$(dependencies-kreismembran) \
 	$(dependencies-sturmliouville) \
@@ -32,4 +33,5 @@ TEXFILES = \
 	$(dependencies-kugel) \
 	$(dependencies-hermite) \
 	$(dependencies-ellfilter) \
+	$(dependencies-dreieck) \
 
diff --git a/buch/papers/common/paperlist b/buch/papers/common/paperlist
index e2ef4c3..f607279 100644
--- a/buch/papers/common/paperlist
+++ b/buch/papers/common/paperlist
@@ -1,7 +1,6 @@
-000template
 lambertw
 fm
-nlwave
+parzyl
 fresnel
 kreismembran
 sturmliouville
@@ -14,3 +13,4 @@ kra
 kugel
 hermite
 ellfilter
+dreieck