merge vutinfminutes into vutinf

5 files changed, 259 insertions, 34 deletions

diff --git a/Makefile b/Makefile
index 4bded4e..c987e4f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,34 +1,10 @@
-NAME  = vutinf
 SHELL = bash
 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)
-all:	$(NAME).pdf
-	test -e README.txt && mv README.txt README || exit 0
-$(NAME).pdf: $(NAME).dtx
-	pdflatex -shell-escape -recorder -interaction=batchmode $(NAME).dtx >/dev/null
-	if [ -f $(NAME).glo ]; then makeindex -q -s gglo.ist -o $(NAME).gls $(NAME).glo; fi
-	if [ -f $(NAME).idx ]; then makeindex -q -s gind.ist -o $(NAME).ind $(NAME).idx; fi
-	pdflatex --recorder --interaction=nonstopmode $(NAME).dtx > /dev/null
-	pdflatex --recorder --interaction=nonstopmode $(NAME).dtx > /dev/null
-clean:
-	rm -f $(NAME).{aux,fls,glo,gls,hd,idx,ilg,ind,ins,log,out} texput.fls
-distclean: clean
-	rm -f $(NAME).{pdf,cls} README
-inst: all
-	mkdir -p $(UTREE)/{tex,source,doc}/latex/$(NAME)
-	cp $(NAME).dtx $(UTREE)/source/latex/$(NAME)
-	cp $(NAME).cls $(UTREE)/tex/latex/$(NAME)
-	cp $(NAME)-logo.pdf $(UTREE)/tex/latex/$(NAME)
-	cp $(NAME).pdf $(UTREE)/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).cls $(LOCAL)/tex/latex/$(NAME)
-	sudo cp $(NAME)-logo.pdf $(LOCAL)/tex/latex/$(NAME)
-	sudo cp $(NAME).pdf $(LOCAL)/doc/latex/$(NAME)
-zip: all
-	ln -sf . $(NAME)
-	zip -Drq $(PWD)/$(NAME)-$(VERS).zip $(NAME)/{README,$(NAME).{pdf,dtx},$(NAME)-logo.pdf}
-	rm $(NAME)
+
+all:
+	make -f Makefile.vutinf
+	make -f Makefile.vutinfminutes
+
+%:
+	make -f Makefile.vutinf $@
+	make -f Makefile.vutinfminutes $@
diff --git a/Makefile.vutinf b/Makefile.vutinf
new file mode 100644
index 0000000..10a6933
--- /dev/null
+++ b/Makefile.vutinf
@@ -0,0 +1,34 @@
+NAME  = vutinf
+SHELL = bash
+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)
+all:	$(NAME).pdf
+	test -e README.$(NAME).txt && mv README.$(NAME).txt README.$(NAME) || exit 0
+$(NAME).pdf: $(NAME).dtx
+	pdflatex -shell-escape -recorder -interaction=batchmode $(NAME).dtx >/dev/null
+	if [ -f $(NAME).glo ]; then makeindex -q -s gglo.ist -o $(NAME).gls $(NAME).glo; fi
+	if [ -f $(NAME).idx ]; then makeindex -q -s gind.ist -o $(NAME).ind $(NAME).idx; fi
+	pdflatex --recorder --interaction=nonstopmode $(NAME).dtx > /dev/null
+	pdflatex --recorder --interaction=nonstopmode $(NAME).dtx > /dev/null
+clean:
+	rm -f $(NAME).{aux,fls,glo,gls,hd,idx,ilg,ind,ins,log,out} texput.fls
+distclean: clean
+	rm -f $(NAME).{pdf,cls} README.$(NAME)
+inst: all
+	mkdir -p $(UTREE)/{tex,source,doc}/latex/$(NAME)
+	cp $(NAME).dtx $(UTREE)/source/latex/$(NAME)
+	cp $(NAME).cls $(UTREE)/tex/latex/$(NAME)
+	cp $(NAME)-logo.pdf $(UTREE)/tex/latex/$(NAME)
+	cp $(NAME).pdf $(UTREE)/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).cls $(LOCAL)/tex/latex/$(NAME)
+	sudo cp $(NAME)-logo.pdf $(LOCAL)/tex/latex/$(NAME)
+	sudo cp $(NAME).pdf $(LOCAL)/doc/latex/$(NAME)
+zip: all
+	ln -sf . $(NAME)
+	zip -Drq $(PWD)/$(NAME)-$(VERS).zip $(NAME)/{README.$(NAME),$(NAME).{pdf,dtx},$(NAME)-logo.pdf}
+	rm $(NAME)
diff --git a/Makefile.vutinfminutes b/Makefile.vutinfminutes
new file mode 100644
index 0000000..3bd4727
--- /dev/null
+++ b/Makefile.vutinfminutes
@@ -0,0 +1,32 @@
+NAME  = vutinfminutes
+SHELL = bash
+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)
+all:	$(NAME).pdf
+	test -e README.$(NAME).txt && mv README.$(NAME).txt README.$(NAME) || exit 0
+$(NAME).pdf: $(NAME).dtx
+	pdflatex -shell-escape -recorder -interaction=batchmode $(NAME).dtx >/dev/null
+	if [ -f $(NAME).glo ]; then makeindex -q -s gglo.ist -o $(NAME).gls $(NAME).glo; fi
+	if [ -f $(NAME).idx ]; then makeindex -q -s gind.ist -o $(NAME).ind $(NAME).idx; fi
+	pdflatex --recorder --interaction=nonstopmode $(NAME).dtx > /dev/null
+	pdflatex --recorder --interaction=nonstopmode $(NAME).dtx > /dev/null
+clean:
+	rm -f $(NAME).{aux,fls,glo,gls,hd,idx,ilg,ind,ins,log,out} texput.fls
+distclean: clean
+	rm -f $(NAME).{pdf,sty} README.$(NAME)
+inst: 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)
+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)
+zip: all
+	ln -sf . $(NAME)
+	zip -Drq $(PWD)/$(NAME)-$(VERS).zip $(NAME)/{README.$(NAME),$(NAME).{pdf,dtx}}
+	rm $(NAME)
diff --git a/vutinf.dtx b/vutinf.dtx
index 95fa285..a777d41 100644
--- a/vutinf.dtx
+++ b/vutinf.dtx
@@ -51,7 +51,7 @@ This work is "maintained" (as per LPPL maintenance status) by
 David Kaufmann.
 
 This work consists of the file .dtx and a Makefile.
-Running "make" generates the derived files README, vutinf.pdf and vutinf.cls.
+Running "make" generates the derived files README.vutinf, vutinf.pdf and vutinf.cls.
 Running "make inst" installs the files in the user's TeX tree.
 Running "make install" installs the files in the local TeX tree.
 
@@ -71,7 +71,7 @@ Running "make install" installs the files in the local TeX tree.
 \nopreamble\nopostamble
 \usedir{doc/latex/}
 \generate{
-  \file{README.txt}{\from{\jobname.dtx}{readme}}
+  \file{README.vutinf.txt}{\from{\jobname.dtx}{readme}}
 }
 \ifx\fmtname\nameofplainTeX
   \expandafter\endbatchfile
diff --git a/vutinfminutes.dtx b/vutinfminutes.dtx
new file mode 100644
index 0000000..3a023d9
--- /dev/null
+++ b/vutinfminutes.dtx
@@ -0,0 +1,183 @@
+% \iffalse meta-comment
+% vim: textwidth=75
+%<*internal>
+\iffalse
+%</internal>
+%<*readme>
+|
+-------------:| -----------------------------------------------------------
+vutinfminutes:| TU Wien Faculty for Informatics meeting minutes package
+       Author:| David Kaufmann
+       E-mail:| david.kaufmann@tuwien.ac.at
+      License:| Released under the LaTeX Project Public License v1.3c or later
+          See:| http://www.latex-project.org/lppl.txt
+
+
+Short description:
+Some text about the package: probably the same as the abstract.
+%</readme>
+%<*internal>
+\fi
+\def\nameofplainTeX{plain}
+\ifx\fmtname\nameofplainTeX\else
+  \expandafter\begingroup
+\fi
+%</internal>
+%<*install>
+\input docstrip.tex
+\keepsilent
+\askforoverwritefalse
+\preamble
+-------------:| -----------------------------------------------------------
+vutinfminutes:| TU Wien Faculty for Informatics meeting minutes package
+       Author:| David Kaufmann
+       E-mail:| david.kaufmann@tuwien.ac.at
+      License:| Released under the LaTeX Project Public License v1.3c or later
+          See:| http://www.latex-project.org/lppl.txt
+
+\endpreamble
+\postamble
+
+Copyright (C) 2020 by David Kaufmann <david.kaufmann@tuwien.ac.at>
+
+This work may be distributed and/or modified under the
+conditions of the LaTeX Project Public License (LPPL), either
+version 1.3c of this license or (at your option) any later
+version.  The latest version of this license is in the file:
+
+http://www.latex-project.org/lppl.txt
+
+This work is "maintained" (as per LPPL maintenance status) by
+David Kaufmann.
+
+This work consists of the file vutinfminutes.dtx and a Makefile.
+Running "make" generates the derived files README.vutinfminutes, vutinfminutes.pdf and vutinfminutes.sty.
+Running "make inst" installs the files in the user's TeX tree.
+Running "make install" installs the files in the local TeX tree.
+
+\endpostamble
+
+\usedir{tex/latex/vutinfminutes}
+\generate{
+  \file{\jobname.sty}{\from{\jobname.dtx}{package}}
+}
+%</install>
+%<install>\endbatchfile
+%<*internal>
+\usedir{source/latex/vutinfminutes}
+\generate{
+  \file{\jobname.ins}{\from{\jobname.dtx}{install}}
+}
+\nopreamble\nopostamble
+\usedir{doc/latex/vutinfminutes}
+\generate{
+  \file{README.vutinfminutes.txt}{\from{\jobname.dtx}{readme}}
+}
+\ifx\fmtname\nameofplainTeX
+  \expandafter\endbatchfile
+\else
+  \expandafter\endgroup
+\fi
+%</internal>
+% \fi
+%
+% \iffalse
+%<*driver>
+\ProvidesFile{vutinfminutes.dtx}
+%</driver>
+%<package>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
+%<package>\ProvidesPackage{vutinfminutes}
+%<*package>
+    [2020/01/31 v1.00 TU Wien Faculty for Informatics meeting minutes package]
+%</package>
+%<*driver>
+\documentclass{ltxdoc}
+\usepackage[a4paper,margin=25mm,left=50mm,nohead]{geometry}
+\usepackage[numbered]{hypdoc}
+\usepackage{\jobname}
+\EnableCrossrefs
+\CodelineIndex
+\RecordChanges
+\begin{document}
+  \DocInput{\jobname.dtx}
+\end{document}
+%</driver>
+% \fi
+%
+% \GetFileInfo{\jobname.dtx}
+% \DoNotIndex{\newcommand,\newenvironment}
+%
+%\title{\textsf{vutinfminutes} --- TU Wien Faculty for Informatics meeting minutes package\thanks{This file
+%   describes version \fileversion, last revised \filedate.}
+%}
+%\author{David Kaufmann\thanks{E-mail: david.kaufmann@tuwien.ac.at}}
+%\date{Released \filedate}
+%
+%\maketitle
+%
+%\changes{v1.00}{2020/01/31}{First public release}
+%
+% \begin{abstract}
+% ==== Put abstract text here. ====
+% \end{abstract}
+%
+% \section{Usage}
+%
+% ==== Put descriptive text here. ====
+%
+% \DescribeMacro{\dummyMacro}
+% This macro does nothing.\index{doing nothing|usage} It is merely an
+% example.  If this were a real macro, you would put a paragraph here
+% describing what the macro is supposed to do, what its mandatory and
+% optional arguments are, and so forth.
+%
+% \DescribeEnv{dummyEnv}
+% This environment does nothing.  It is merely an example.
+% If this were a real environment, you would put a paragraph here
+% describing what the environment is supposed to do, what its
+% mandatory and optional arguments are, and so forth.
+%
+%\StopEventually{^^A
+%  \PrintChanges
+%  \PrintIndex
+%}
+%
+% \section{Implementation}
+%
+%    \begin{macrocode}
+%<*package>
+\usepackage{titlesec}
+\titleformat{\part}{\normalfont\large\bfseries}{}{0em}{}
+\titlespacing\part{0pt}{6pt plus 4pt minus 2pt}{6pt plus 2pt minus 2pt}
+\titleformat{\section}{\normalfont\bfseries}{\hspace{7mm}TOP \thesection: }{0em}{}
+\titlespacing\section{0pt}{6pt plus 4pt minus 2pt}{6pt plus 2pt minus 2pt}
+%    \end{macrocode}
+% ueberschriften, don't auto-add pdf outline or TOC entries
+%    \begin{macrocode}
+\renewcommand\addcontentsline[3]{}
+%    \end{macrocode}
+% \begin{macro}{\MEETING}
+% \~MEETING defines a \~part, has one argument (the title) and adds it to the
+% pdf outline
+%    \begin{macrocode}
+\newcommand{\MEETING}[1]{
+	\part{#1}
+	\pdfbookmark[0]{#1}{part-\thepart}
+}
+%    \end{macrocode}
+% \end{macro}
+% \begin{macro}{\TOP}
+% \~TOP adds a topic/Tagesordnungspunkt, has one argument (the title) and
+% adds it to the pdf outline
+%    \begin{macrocode}
+\newcommand{\TOP}[1]{
+	\section{#1}
+	\pdfbookmark[1]{TOP \thesection: #1}{top-\thesection}
+}
+%    \end{macrocode}
+% \end{macro}
+%    \begin{macrocode}
+\endinput
+%</package>
+%    \end{macrocode}
+%\Finale