--- a/ProgTutorial/document/root.tex	Sat May 30 17:40:20 2009 +0200
+++ b/ProgTutorial/document/root.tex	Sat May 30 23:58:05 2009 +0200
@@ -16,6 +16,7 @@
 \usepackage{mathpartir}
 \usepackage{flafter}
 \usepackage{makeidx}
+\usepackage{tocbibind}
 \usepackage{pdfsetup}
 
 \urlstyle{rm}
@@ -25,10 +26,6 @@
 \isadroptag{theory}
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% adding chapters explicitly to the table of content
-\newcommand{\tocentry}[1]{\cleardoublepage\phantomsection\addcontentsline{toc}{chapter}{#1}}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % indexing
 \makeindex
 \newcommand{\indexdef}[2]{\index{#1 (#2)}}
@@ -161,20 +158,20 @@
 \maketitle
 
 % table of contents
-\tocentry{\contentsname}
+\frontmatter
 \setcounter{tocdepth}{1}
 \tableofcontents
 
 % generated text of all theories
+\mainmatter
 \input{session}
 
 % bibliography
-\tocentry{\bibname}
+\backmatter
 \bibliographystyle{abbrv}
 \bibliography{root}
 
 % index
-\tocentry{\indexname}
 \printindex
 
 \end{document}