juramisc 0.90 update

git-svn-id: svn://tug.org/texlive/trunk@1723 c570f23f-e606-0410-a88d-b1316a301751

5 files changed, 1068 insertions, 455 deletions

diff --git a/Master/texmf-dist/tex/latex/juramisc/jbgoe.clo b/Master/texmf-dist/tex/latex/juramisc/jbgoe.clo
new file mode 100644
index 00000000000..2283a65a61e
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/juramisc/jbgoe.clo
@@ -0,0 +1,49 @@
+% jbgoe.clo - jurabook class option
+%  
+% Official title: Georg-August-Universitaet Goettingen
+% 
+% Version 1 (03.03.06 21:43)
+%
+% 2006 Axel Sodtalbers (juramisc@sodtalbers.de)
+% 
+
+\ClassInfo{jurabook}{Setting up the official goettingen university thesis titlepage \@gobble}
+\renewcommand{\maketitle}{%
+  \begin{titlepage}
+    \begin{center}
+      \jb@officialtitle@style%
+      \@title \par%
+      \ifx\@subtitle\@empty% 
+      \else
+        \vskip 4ex\par
+        \@subtitle\par%
+      \fi
+      \vskip 8ex\par%
+      Dissertation\bigskip
+    
+      zur Erlangung des Doktorgrades\par
+      des Juristischen Fachbereichs\par
+      (Juristische Fakult\"at)\par
+      der Georg-August-Universit\"at zu G\"ottingen\par%
+      \vskip 2ex
+    
+      vorgelegt\par
+      von\par%
+      \vskip 4ex
+      \@author\par%
+      \vskip 2ex
+      aus \@birthplace\par
+      \vskip 4ex
+      \@publishplace\space\@publishyear
+    \end{center}
+    \newpage
+    \thispagestyle{empty}
+    \begin{tabular}[2]{ll}
+    \firstexaminername & \@firstexaminer\\
+    \secondexaminername & \@secondexaminer\\
+    Tag der m\"undlichen Pr\"ufung: & \@examdate\\\
+    \end{tabular}
+  \end{titlepage}%
+  \@emptytitles%
+}
+\endinput
\ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/juramisc/jbstgallen.clo b/Master/texmf-dist/tex/latex/juramisc/jbstgallen.clo
new file mode 100644
index 00000000000..b1c206dd7cd
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/juramisc/jbstgallen.clo
@@ -0,0 +1,66 @@
+% jbstgallen.clo - jurabook class option
+%  
+% Official title: Universitaet St. Gallen
+% 
+% Version 1 (2006/05/24)
+%
+% 2006 Axel Sodtalbers
+
+\ClassInfo{jurabook}{Setting up the official st gallen university thesis titlepage \@gobble}
+\renewcommand{\maketitle}{%
+  \begin{titlepage}
+    {\large
+    \begin{center}
+      \vspace*{2\baselineskip}
+      
+      {\sffamily\Large Universit\"at St. Gallen --\par
+      
+      Hochschule f\"ur Wirtschafts-\par
+      
+      Rechts- und Sozialwissenschaften\par}
+      
+      \vspace{.5\baselineskip}
+          
+      \rule{\textwidth}{1.5pt}
+      
+      \vspace{3\baselineskip}
+       
+      {\Huge\bfseries \@title\par}
+ 
+      \ifx\@subtitle\@empty% 
+        \vspace{6\baselineskip}
+      \else
+        \vspace{1\baselineskip}%
+        {\bfseries\@subtitle\par}%
+        \vspace{3\baselineskip}
+      \fi
+     
+       vorgelegt von
+       
+       \vspace{1\baselineskip}
+     
+       \@author
+
+       \vspace{2\baselineskip}%  
+      
+       \@date
+    \end{center}
+       
+    \vspace{4ex}
+       
+    Referent: \@firstexaminer\par
+       
+    Koreferent: \@secondexaminer\par%
+    }
+     
+    \vspace{\fill} 
+       
+    \begin{center}
+      {\small\@author\par
+      
+      \@publishinfo\par}
+    \end{center}
+  \end{titlepage}
+  \@emptytitles%
+}  
+\endinput
\ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/juramisc/jbtrier.clo b/Master/texmf-dist/tex/latex/juramisc/jbtrier.clo
new file mode 100644
index 00000000000..87850e47752
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/juramisc/jbtrier.clo
@@ -0,0 +1,55 @@
+% jbtrier.clo - jurabook class option
+%  
+% Official title: Universitaet Trier
+% 
+% Version 1 (03.03.06 21:56)
+%
+% 2006 Peter Schuster
+
+\ClassInfo{jurabook}{Setting up the official trier university thesis titlepage \@gobble}
+\renewcommand{\maketitle}{%
+  \begin{titlepage}
+    \begin{center} %% Den ganzen Text auf der Titelseite zentrieren
+      {\sffamily\bfseries%
+       \hrulefill
+       
+       {\Huge \@title\par}
+        
+       \vspace{0.7cm}
+
+       {\large \@subtitle\par}
+       
+       \hrulefill%
+      }%
+
+      \vspace{3cm}
+
+      \normalsize\underline{Inaugural-Dissertation}
+
+      zur Erlangung des Grades eines
+
+      Doktors der Rechte
+
+      des Fachbereichs Rechtswissenschaft
+
+      der Universit\"at Trier
+
+      \vspace{3.4cm}
+
+      vorgelegt von
+
+      \@author
+
+      \vspace{2.5ex}
+
+      aus \@birthplace
+
+      \vspace{2.5cm}
+
+      \number\year
+
+    \end{center}
+  \end{titlepage}
+  \@emptytitles%
+}
+\endinput
\ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/juramisc/jurabase.sty b/Master/texmf-dist/tex/latex/juramisc/jurabase.sty
index 2da2f175988..6e7507ac3f9 100644
--- a/Master/texmf-dist/tex/latex/juramisc/jurabase.sty
+++ b/Master/texmf-dist/tex/latex/juramisc/jurabase.sty
@@ -1,4 +1,4 @@
-% last change   : 13-Sep-04 21:35:20
+% last change   : 05.06.05 14:04
 % status        : 0.16 beta
 % created       : 2001/06/28 17:49:53
 %
@@ -9,11 +9,8 @@
 % © Axel Sodtalbers
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{jurabase}[2004/09/13 V0.13 basic jura commands (AS)]
+\ProvidesPackage{jurabase}[2005/06/05 V0.16 basic jura commands (AS)]
 
-% changes:
-% =====================
-% - neue Abkuerzung \oa
 
 
 %========================================
@@ -224,6 +221,9 @@ a.\,A.\xspace}
 \newcommand*{\AnA}{% Abkuerzung fuer andere Ansicht - die wird zugelassen, weil ueblich!
 A.\,A.\xspace}
 
+\newcommand*{\aM}{% Abkuerzung fuer andere(r) Meinung 
+a.\,M.\xspace}
+
 \newcommand*{\aaO}{% Abkuerzung fuer am angegebenen Ort
 a.\,a.\,O.\xspace}
 
@@ -314,6 +314,9 @@ o.\,a.\xspace}
 \newcommand*{\og}{% Abkuerzung fuer oben genannten
 o.\,g.\xspace}
 
+\newcommand*{\mE}{% Abkuerzung fuer meines Erachtens
+m.\,E.\xspace}
+
 \newcommand*{\maW}{% Abkuerzung fuer mit anderen Worten
 m.\,a.\,W.\xspace}
 
@@ -345,6 +348,9 @@ u.\,U.\xspace}
 \newcommand*{\vAw}{% Abkuerzung fuer von Amts wegen
 v.\,A.\,w.\xspace}
 
+\newcommand*{\va}{% Abkuerzung fuer vor allem
+v.\,a.\xspace}
+
 \newcommand*{\zT}{% Abkuerzung fuer zum Teil
 z.\,T.\xspace}
 
diff --git a/Master/texmf-dist/tex/latex/juramisc/jurabook.cls b/Master/texmf-dist/tex/latex/juramisc/jurabook.cls
index be42c5a168e..ae8cd1a80e3 100644
--- a/Master/texmf-dist/tex/latex/juramisc/jurabook.cls
+++ b/Master/texmf-dist/tex/latex/juramisc/jurabook.cls
@@ -1,18 +1,14 @@
-% last change   : 23-Okt-04 21:02:25
-% status        : 0.75 beta
+% last change   : 2006-05-28 18:23:52
+% status        : 0.90 beta
 % created       : 2001/06/28 17:49:53
 %
-% subject       : german phd thesis law
-%
-% to do         : very much ... :-)
-%
-% don't blame me for this piece of code ...
+% subject       : typesetting german phd thesis law
 %
 % © Axel Sodtalbers (juramisc@sodtalbers.de)
 
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{jurabook}[2004/10/24 V0.75 (beta) juridical books (AS)]
+\ProvidesClass{jurabook}[2006/05/28 V0.90 (beta) juridical books (AS)]
 
 % for a change history cf. 
 % doc/jmgerdoc.tex (\subsubsection{Versionsgeschichte})
@@ -27,6 +23,7 @@
 \RequirePackage{jurabase}% calc, ifthen, xspace
 \RequirePackage{remreset}
 \RequirePackage{fancyhdr}
+\RequirePackage{multicol}
 % fancyhdr muss aktuell (>V.2) sein, da es aber keine Versionsinformation
 % besitzt, versuchen wir es so:
 \@ifundefined{fancyhead}%
@@ -40,12 +37,38 @@
 
 %========================================
 %               
-% Klassen-Optionen 
+% jurabook version information
+%
+%========================================
+
+\newcommand*{\jurabookversion}{V0.90 (beta)}
+\newcommand*{\jurabookdate}{2006/05/28}
+
+
+%========================================
+%               
+% Class options 
 %
 %========================================
 
 \iffalse
 
+  allowhyphens
+  ==================
+  Trennungn in Chapter und Section? 
+  -> default: false
+
+\fi
+
+\newif\if@allowhyphens
+\@allowhyphensfalse
+
+\DeclareOption{allowhyphens}{\@allowhyphenstrue}
+    
+
+
+\iffalse
+
   indexpagenumbers
   ==================
   Sollen Seitenzahlen in den Index aufgenommen werden (statt der Randnummern)? 
@@ -178,16 +201,30 @@
 
 \iffalse
 
+  centeredpartsintoc
+  ==================
+  Sollen die 'parts' (nur) im Inhaltsverzeichnis zentriert werden?
+  -> default: false
+
   centeredlayout
   ==================
-  Sollen die 'parts' im Inhaltsverzeichnis zentriert werden?
+  Sollen die 'parts' und chapter im Inhaltsverzeichnis
+  UND im Text zentriert werden?
   -> default: false
 
 \fi
+
+
+\newif\if@centeredpartsintoc
+\@centeredpartsintocfalse
+\DeclareOption{centeredpartsintoc}{\@centeredpartsintoctrue}
+
   
 \newif\if@centeredlayout
 \@centeredlayoutfalse
-\DeclareOption{centeredlayout}{\@centeredlayouttrue}
+\DeclareOption{centeredlayout}{%
+  \@centeredlayouttrue%
+  \@centeredpartsintoctrue}
 
 
 \iffalse
@@ -199,6 +236,17 @@
 
 \fi
 
+\iffalse
+
+  screenmode
+  ==========
+  output for screen (not print), hyperref and co
+  -> default: false
+\fi
+  
+\newif\ifjscreen
+\jscreenfalse
+\DeclareOption{screenmode}{\@jscreentrue}
 
 \newif\if@compactlayout
 \@compactlayoutfalse
@@ -246,6 +294,18 @@
 
 \iffalse
 
+  seminar
+  ========
+  Output without chapters? (for smaller papers, e.g. used in a seminar)
+  -> default: false
+\fi
+  
+\newif\if@seminar
+\@seminarfalse
+\DeclareOption{seminar}{\@seminartrue}
+
+\iffalse
+
   chapterprefix
   ===============
   Erst 'Kapitel', dann die Kapitelummer?
@@ -279,7 +339,7 @@
 
   fixtocindent
   ===============
-  sections werden um eine fixe Breite (defaulttocindent, 1.5em)
+  sections werden um eine fixe Breite (jb@defaulttocindent@length=1.5em)
   eingerueckt.
   
   -> default: false
@@ -306,13 +366,6 @@
 
 
 \iffalse
-
-  officialtitle
-  =============
-  "Offizielle" Titelei gem. Promotionsordnung?
-  -> default: false
-  
-  Gekoppelt an 'goettingen'-Option:
   
   goettingen
   ==========
@@ -320,36 +373,53 @@
   -> default: false
 \fi
 
-\newif\if@officialtitle
-\@officialtitlefalse
 \newif\if@goettingen
 \@goettingenfalse
 
-\DeclareOption{officialtitle}{%
-  \@officialtitletrue%
-  \@goettingentrue}
-
 
 \DeclareOption{goettingen}{%
-  \@officialtitletrue%
   \@goettingentrue}
 
 
 \iffalse
 
-  bonn
+  trier
+  ==========
+  Offizieller Titel nach der Trierer Promotionsordnung
+  -> default: false
+\fi
+
+\newif\if@trier
+\@trierfalse
+
+\DeclareOption{trier}{%
+  \@triertrue}
+
+\iffalse
+
+  stgallen
   ==========
-  Offizieller Titel nach der Bonner Promotionsordnung
+  Offizieller Titel der Uni St. Gallen
   -> default: false
 \fi
 
-\newif\if@bonn
-\@bonnfalse
+\newif\if@stgallen
+\@stgallenfalse
+
+\DeclareOption{stgallen}{%
+  \@stgallentrue}
+
+
 
-\DeclareOption{bonn}{%
-  \@officialtitletrue%
-  \@goettingenfalse
-  \@bonntrue}
+
+\newif\if@ruwtitle
+\@ruwtitlefalse
+
+\DeclareOption{ruwtitle}{%
+  \@ruwtitletrue%
+  \newsavebox{\titlepublisherbox}%
+  \savebox{\titlepublisherbox}{}%
+}
 
 
 \iffalse
@@ -363,6 +433,20 @@
 \ProcessOptions\relax
 
 
+% chapters titles' justification
+% this is experimental and not completed 
+%
+% if you want ragged right justification, try
+%   \let\jubo@csalign@hook\raggedright
+
+\newcommand{\jubo@csalign@hook}{\relax}
+\if@allowhyphens%
+  \RequirePackage{ragged2e}%
+  \let\jubo@csalign@hook\RaggedRight%
+\else
+\fi
+
+
 \iffalse
   Output of all options (for debugging purposes)
 \fi
@@ -404,6 +488,7 @@
   \@jb@checkopt{longfnrule}
   \@jb@checkopt{classiclayout}
   \@jb@checkopt{centeredlayout}
+  \@jb@checkopt{centeredpartsintoc}
   \if@compactlayout \@jb@oo{compact: off}\else\@jb@oo{compact: on}\fi
   \@jb@checkopt{decisionhints}  
   \if@secinovw \@jb@oo{overviewwithsec: off}\else\@jb@oo{overviewwithsec: on}\fi
@@ -418,7 +503,7 @@
 
 %========================================
 %               
-% Weitere Vorbereitungen ...
+% Further preparations ...
 %
 %========================================
 
@@ -430,8 +515,8 @@
 \fi
 
 % pdf support
-\newif\ifjubopdftex
-\jubopdftexfalse
+\newif\ifjpdf
+\jpdffalse
 
 % somewhat complicate construction, but:
 % no if ... constructions allowd inside IfFileExists
@@ -445,15 +530,15 @@
   {\relax}
 
 \if@ifpdfloaded
-  \ifpdf\jubopdftextrue\else\jubopdftexfalse\fi
+  \ifpdf\jpdftrue\else\jpdffalse\fi
 \else
   \ClassWarningNoLine{jurabook}%
     {Cannot load 'ifpdf.sty' - please get this\MessageBreak
      package from CTAN. Now I'll use a poor man's\MessageBreak
-     solution to detect pdf usage ..}%
+     solution to detect pdftex usage in pdf mode..}%
   \@ifundefined{pdfoutput}%
-    {\jubopdftexfalse}% 
-    {\jubopdftextrue}% we're using pdfLaTeX
+    {\jpdffalse}% 
+    {\ifcase\pdfoutput\jpdffalse\else\jpdftrue\fi}% we're using pdfLaTeX in pdf mode
 \fi
 
 
@@ -463,39 +548,63 @@
 \newif\if@hyperrefloaded
 \@hyperrefloadedfalse
 
-% Folgender Trick notwendig, sonst bleiben Kopfzeilen kuerzer bei Verwendung
-% von a4wide.sty o. ae. Geruempel
 
-\AtBeginDocument{\FinalJuboSettings}
+% which language is loaded?
+% jb@languageloaded = -1 -> undefinied
+%                   =  0 -> german (babel)
+%                   =  1 -> ngerman (babel)
+%                   =  2 -> german (package)
+%                   =  3 -> ngerman (package)
+
+\newcounter{jb@languageloaded}
+\setcounter{jb@languageloaded}{\m@ne}
 
-\newcommand{\FinalJuboSettings}{%
+\newcommand{\jb@detectlanguage}{
   \@ifpackageloaded{babel}%
     {\iflanguage{german}%
-      {\addto\captionsgerman{\renewcommand{\partname}{Teil:}}
-       \selectlanguage{german}%
+      {\setcounter{jb@languageloaded}{0}%
       }%
       {\iflanguage{ngerman}%
-        {\addto\captionsngerman{\renewcommand{\partname}{Teil:}}
-         \selectlanguage{ngerman}%
+        {\setcounter{jb@languageloaded}{1}%
         }%
         {\ClassWarningNoLine{jurabook}%
           {This class is designed for german documents only,\MessageBreak
            so please select 'german' or 'ngerman' language option}%
         }%
-      }%     
+      }%
     }%
-    {% jurabook gibt zwar eine Meldung aus, macht dann aber ungeruehrt weiter ...
-     \@ifpackageloaded{german}%
-       {\relax}%
+    {\@ifpackageloaded{german}%
+       {\setcounter{jb@languageloaded}{2}%
+       }%
        {\@ifpackageloaded{ngerman}%
-         {\relax}%
+         {\setcounter{jb@languageloaded}{3}%
+         }%
          {\ClassWarningNoLine{jurabook}%
             {This class is designed for german documents only,\MessageBreak
-             so please use 'german', 'ngerman' or 'babel' package}%
+             so please use 'german', 'ngerman' or 'babel' package.\MessageBreak
+             I will proceed, but results will be unpredictable}%
          }%
-       }%  
-     \renewcommand{\partname}{Teil:}%
-    }% 
+       }% 
+    }%
+}
+
+
+% Folgender Trick notwendig, sonst bleiben Kopfzeilen kuerzer bei Verwendung
+% von a4wide.sty o. ae. Geruempel
+
+\AtBeginDocument{\Kickst@rt}
+
+\newcommand{\Kickst@rt}{%
+  \jb@detectlanguage%
+  \ifcase\value{jb@languageloaded}%
+    \addto\captionsgerman{\renewcommand{\partname}{Teil:}}%
+    \selectlanguage{german}%
+  \or%
+    \addto\captionsngerman{\renewcommand{\partname}{Teil:}}%
+    \selectlanguage{ngerman}%
+  \else%
+    \renewcommand{\partname}{Teil:}% german or ngerman package loaded
+  \fi%
   \setchaptername{\textsection}%
   \SetJuboPagestyle%
   \if@longfnrule%   Paketoption 'longfnrule' = TRUE? 
@@ -517,36 +626,42 @@
     {\relax}%
   \renewcommand{\@pnumwidth}{2em}% statt 1.55
   \renewcommand{\@tocrmarg}{4em}%  statt 2.55
-  \setlength{\proofmodetextwidth}{.77\textwidth}%
-  \setlength{\proofmodeleftmargin}{\z@}%
+  \setlength{\jb@proofmodetextwidth@length}{.77\textwidth}%
+  \setlength{\jb@proofmodeleftmargin@length}{\z@}%
 }
 
 
-% einige Reportausgaben:
+% some report output:
 \AtEndDocument{%
-  \wlog{^^J^^J-------------------^^Jjurabook Info:}
-  \wlog{\therealchapters\space Kapitel (chapters), \thetotalsections\space Abschnitte (sections).}
-  \wlog{\therunner\space Randnummern.}
-  \wlog{\thetotalfootnotes\space Fussnoten.}
-  \wlog{\thetotaldcs\space Entscheidungen (\thetotaldecisions\space beruecksichtigt, \thetotalnotyets\space nicht beruecksichtigt).}%
-  \wlog{\thetotalwebcites\space WWW-Zitierungen innerhalb des Textes.}
+  \wlog{--------------}
+  \wlog{jurabook info:}
+  \wlog{--------------}
+  \ifjpdf
+    \wlog{The document was set using pdftex in pdf mode.}
+  \else
+    \wlog{The document was set using tex/pdftex in dvi mode.}
+  \fi  
+  \wlog{\therealchapters\space chapters, \thetotalsections\space sections.}
+  \wlog{\therunner\space paragraphs with runner.}
+  \wlog{\thetotalfootnotes\space footnotes.}
+  \wlog{\thetotaldcs\space decisions (\thetotaldecisions\space mentioned, \thetotalnotyets\space not mentioned).}%
+  \wlog{\thetotalwebcites\space WWW cites within document.}
   \if@dorunners
-    \wlog{Randnummern sind eingeschaltet.}
+    \wlog{You are using runners.}
   \else
-    \wlog{Randnummern sind ausgeschaltet!!}
+    \wlog{No runners used.}
   \fi
   \if@indexpagenumbers
-    \wlog{In den Index wurden Seitenzahlen geschrieben.}
+    \wlog{Pagenumbers written to index.}
   \else
-    \wlog{In den Index wurden Randnummern geschrieben.}
+    \wlog{Runners written to index.}
   \fi%
   \if@compactlayout
-    \wlog{Kompaktes Layout gewaehlt.}
+    \wlog{Compact layout used.}
   \fi
   \if@centeredlayout
-    \wlog{Zentriertes Layout gewaehlt.}
+    \wlog{Centered layout used.}
   \fi  
-  \wlog{^^J}%
 }
 
 %================================================================================
@@ -571,37 +686,66 @@
 %
 % Example: \jb@title@style
 
-\newcommand*{\jb@officialtitle@style}{\large}
-
-\if@classiclayout
-  \newcommand*{\jb@title@style}{\LARGE}
-  \newcommand*{\jb@subtitle@style}{\large}
-  \newcommand*{\jb@author@style}{\large}
-  \newcommand*{\jb@titledate@style}{\large}
-\else
-  \newcommand*{\jb@title@style}{\Huge\bfseries}
-  \newcommand*{\jb@subtitle@style}{\Large}
-  \newcommand*{\jb@author@style}{\Large}
-  \newcommand*{\jb@titledate@style}{\large}
-\fi
-\newcommand*{\jb@publishinfo@style}{\Large}
-\newcommand*{\jb@thanks@style}{\normalsize}
-
-\newcommand*{\jb@maketime@style}{\small\itshape}
 
+% \setjbookstyle{elemt}{styledef}
+%                #1     #2
 
-% #1: element
-% #2: style
 
 \newcommand{\setjbookstyle}[2]{%
   \@ifundefined{jb@#1@style}%
     {\ClassWarningNoLine{jurabook}%
-     {You try to set the element '#1'\MessageBreak
+     {You are trying to set the element\MessageBreak
+      '#1'\MessageBreak
       using the \protect\setjbookstyle\space command,\MessageBreak
       but jurabook does not know this element}}%
-    {\expandafter\def\csname jb@#1@style\endcsname{#2}}%
+    {\expandafter\def\csname jb@#1@style\endcsname{#2}%
+     \ClassInfo{jurabook}{redefining #1 style (-> \protect #2)}}%
+}
+
+
+% length command
+%
+% every length has the following format:
+%  \jb @ element @ length 
+%
+% Example: \jb@chapterbefore@length
+
+
+% \setjbooklength{element}{lengthvalue}
+%                 #1       #2
+
+\newcommand{\setjbooklength}[2]{%
+  \@ifundefined{jb@#1@length}%
+    {\ClassWarningNoLine{jurabook}%
+     {You are trying to set the element\MessageBreak
+      '#1'\MessageBreak
+      using the \protect\setjbooklength\space command,\MessageBreak
+      but jurabook does not know this element}}%
+    {\csname jb@#1@length\endcsname=#2%
+     \ClassInfo{jurabook}{redefining #1 length (-> #2)}}%
 }
 
+% set text command
+%
+% every text has the following format:
+%  \jb @ element @ text
+%
+% Example: \jb@maketime@text
+
+
+% \setjbooktext{element}{textstring}
+%               #1       #2
+
+\newcommand{\setjbooktext}[2]{%
+  \@ifundefined{jb@#1@text}%
+    {\ClassWarningNoLine{jurabook}%
+     {You are trying to set the element\MessageBreak
+      '#1'\MessageBreak
+      using the \protect\setjbooktext\space command,\MessageBreak
+      but jurabook does not know this element}}%
+    {\expandafter\def\csname jb@#1@text\endcsname{#2}%
+     \ClassInfo{jurabook}{Setting #1 text (-> "#2")}}%
+}
 
 %============================================
 %               
@@ -627,14 +771,35 @@
 \fi
 
 
+\newcommand*{\jb@officialtitle@style}{\large}
+
+\if@classiclayout
+  \newcommand*{\jb@title@style}{\LARGE}
+  \newcommand*{\jb@subtitle@style}{\large}
+  \newcommand*{\jb@author@style}{\large}
+  \newcommand*{\jb@titledate@style}{\large}
+\else
+  \newcommand*{\jb@title@style}{\Huge\bfseries}
+  \newcommand*{\jb@subtitle@style}{\Large}
+  \newcommand*{\jb@author@style}{\Large}
+  \newcommand*{\jb@titledate@style}{\large}
+\fi
+\newcommand*{\jb@publishinfo@style}{\Large}
+\newcommand*{\jb@publishplace@style}{\Large}
+\newcommand*{\jb@thanks@style}{\normalsize}
+\newcommand*{\jb@from@style}{\normalsize}
+\newcommand*{\jb@subauthor@style}{\jb@from@style}
+  
 \def\subtitle#1{\gdef\@subtitle{#1}}
 \def\@subtitle{}
+\def\subauthor#1{\gdef\@subauthor{#1}}
+\def\@subauthor{}
 \def\publishinfo#1{\gdef\@publishinfo{#1}}
 \def\@publishinfo{}
 \def\birthplace#1{\gdef\@birthplace{#1}}
 \def\@birthplace{}
 \def\publishplace#1{\gdef\@publishplace{#1}}
-\def\@publishplace{G\"ottingen}
+\def\@publishplace{}
 \def\publishyear#1{\gdef\@publishyear{#1}}
 \def\@publishyear{\the\year}
 
@@ -647,107 +812,148 @@
 \def\examdate#1{\gdef\@examdate{#1}}
 \def\@examdate{\today}
 
+
+% #1: university  (goettingen)
+% #2: filename    (goe)
+
+\newcommand{\notitlefileerror}[2]{
+  \ClassError{jurabook}%
+        {You request the official #1 titlepage,\MessageBreak
+         but I cannot find the file 'jb#2.clo'}%
+        {Get 'jb#2.clo' from CTAN or www.sodtalbers.de/tex.}%
+}
+
 \if@titlepage%
-  \if@officialtitle%
-    \if@goettingen
-     \wlog{hi}
-      \ClassInfo{jurabook}{Setting up the official titlepage (goettingen)\@gobble}
-      \renewcommand{\maketitle}{%
-        \begin{titlepage}
-          \begin{center}
-            \jb@officialtitle@style%
-            \@title \par%
-            \ifx\@subtitle\@empty% 
-            \else
-              \vskip 4ex\par
-              \@subtitle\par%
-            \fi
-            \vskip 8ex\par%
-            Dissertation\bigskip
-          
-            zur Erlangung des Doktorgrades\par
-            des Juristischen Fachbereichs\par
-            (Juristische Fakult\"at)\par
-            der Georg-August-Universit\"at zu G\"ottingen\par%
-            \vskip 2ex
-          
-            vorgelegt\par
-            von\par%
-            \vskip 4ex
-            \@author\par%
-            \vskip 2ex
-            aus \@birthplace\par
-            \vskip 4ex
-            \@publishplace\space\@publishyear
-          \end{center}
-          \newpage
-          \thispagestyle{empty}
-          \begin{tabular}[2]{ll}
-          \firstexaminername & \@firstexaminer\\
-          \secondexaminername & \@secondexaminer\\
-          Tag der m\"undlichen Pr\"ufung: & \@examdate\\\
-          \end{tabular}
-        \end{titlepage}%
-        \@emptytitles%
-        }
+  \if@goettingen%
+    \InputIfFileExists{jbgoe.clo}%
+      {\relax}%
+      {\notitlefileerror{goettingen}{goe}}%
+  \else
+    \if@trier%
+      \InputIfFileExists{jbtrier.clo}%
+        {\relax}%
+        {\notitlefileerror{trier}{trier}}%
     \else
-      \if@bonn % for testing purposes
-        \ClassInfo{jurabook}{Setting up the official titlepage (bonn)\@gobble}
-      \else
-%        hier kommen vielleicht einmal andere Unis hinein ...
-      \fi
-    \fi%
-  \else%
-    \renewcommand{\maketitle}{%
-      \begin{titlepage}%
-        \let\footnotesize\small
-        \let\footnoterule\relax
-        \let \footnote \thanks
-        \null\vfil%
-        %\vskip 60\p@
-        \begin{center}%
-        \if@classiclayout% original definition: 
-          {\jb@title@style\@title\par}%
-          \ifx\@subtitle\@empty% \ifthenelse funzt hier nicht wg. moegl. '\\'
-          \else%
-            {\jb@subtitle@style\vskip 4ex\@subtitle\par}%
-          \fi%
-          {\jb@author@style
-           \vskip 8ex von\par
-           \vskip 1ex%
-           \lineskip .75em%
-           \begin{tabular}[t]{c}%
-             \@author
-           \end{tabular}\par%
-           \vskip 1.5em}%
-          {\jb@titledate@style\@date\par}%
-        \else % slightly modernized:
-          {\jb@title@style\vskip 2ex \@title\par}%
-          \ifx\@subtitle\@empty% \ifthenelse funzt hier nicht wg. moegl. '\\'
-          \else
-            {\jb@subtitle@style\vskip 4ex\@subtitle \par}%
-          \fi%
-          {\jb@author@style\vskip 8ex von\par
-           \vskip 1ex%
-           \lineskip .75em%
-           \begin{tabular}[t]{c}%
-             \@author
-           \end{tabular}\par%
-           \vskip 1.5em}
-          {\jb@titledate@style\@date\par}%     
-        \fi%
-        \end{center}\par  
-        {\jb@thanks@style\@thanks\par}
-        \ifx\@publishinfo\@empty%
-          {\vfil\null}%
-        \else% 
-          {\vfill\hfil\jb@publishinfo@style\@publishinfo\hfil}%
-        \fi%
-      \end{titlepage}%
-    \@emptytitles%
-    }%
-  \fi  
-\else % Option 'notitlepage' gesetzt - nicht mit jurabook!
+      \if@stgallen%
+        \InputIfFileExists{jbstgallen.clo}%
+          {\relax}%
+          {\notitlefileerror{stgallen}{stgallen}}%
+      \else%
+        \if@ruwtitle% 
+          \renewcommand{\maketitle}{%
+            \begin{titlepage}%
+              \let\footnotesize\small
+              \let\footnoterule\relax
+              \let \footnote \thanks
+              {\centering%
+                \vspace*{\jb@chapterbefore@length}%
+                {\jb@title@style\@title\par}%
+                \ifx\@subtitle\@empty% \ifthenelse funzt hier nicht wg. moegl. '\\'
+                \else
+                  {\jb@subtitle@style\vskip 4ex\@subtitle \par}%
+                \fi%
+                {\jb@from@style\vskip 8ex von\par}%
+                {\jb@author@style
+                 \vskip 1ex%
+                 \lineskip .75em%
+                 \begin{tabular}[t]{c}%
+                   \@author
+                 \end{tabular}\par%
+                } 
+                \ifx\@subauthor\@empty% 
+                \else%
+                  {\jb@subauthor@style%
+                   \vskip 1ex
+                   \begin{tabular}[t]{c}%
+                     \@subauthor
+                   \end{tabular}\par}%
+                \fi%
+                \vfill
+                \begin{tabular}[t]{c}%
+                  \usebox{\titlepublisherbox}
+                \end{tabular}%
+              \par}  
+            \@emptytitles%
+            \end{titlepage}%
+          }%
+        \else%
+          \renewcommand{\maketitle}{%
+            \begin{titlepage}%
+              \let\footnotesize\small
+              \let\footnoterule\relax
+              \let \footnote \thanks
+              \null\vfil%
+              %\vskip 60\p@
+              \begin{center}%
+              \if@classiclayout% original definition: 
+                {\jb@title@style\@title\par}%
+                \ifx\@subtitle\@empty% \ifthenelse funzt hier nicht wg. moegl. '\\'
+                \else%
+                  {\jb@subtitle@style\vskip 4ex\@subtitle\par}%
+                \fi%
+                {\jb@author@style%
+                 \vskip 8ex von\par
+                 \vskip 1ex%
+                 \lineskip .75em%
+                 \begin{tabular}[t]{c}%
+                   \@author
+                 \end{tabular}\par%
+                }% 
+                \ifx\@subauthor\@empty% 
+                \else%
+                  {\jb@subauthor@style%
+                   \vskip 1ex
+                   \begin{tabular}[t]{c}%
+                     \@subauthor
+                   \end{tabular}\par}%
+                \fi%
+                \vskip 1.5em%
+                {\jb@titledate@style\@date\par}%
+              \else % slightly modernized:
+                {\jb@title@style\vskip 2ex \@title\par}%
+                \ifx\@subtitle\@empty% \ifthenelse funzt hier nicht wg. moegl. '\\'
+                \else
+                  {\jb@subtitle@style\vskip 4ex\@subtitle \par}%
+                \fi%
+                {\jb@from@style\vskip 8ex von\par}%
+                {\jb@author@style
+                 \vskip 1ex%
+                 \lineskip .75em%
+                 \begin{tabular}[t]{c}%
+                   \@author
+                 \end{tabular}\par%
+                } 
+                \ifx\@subauthor\@empty% 
+                \else%
+                  {\jb@subauthor@style%
+                   \vskip 1ex
+                   \begin{tabular}[t]{c}%
+                     \@subauthor
+                   \end{tabular}\par}%
+                \fi%
+                \vskip 1.5em% 
+                {\jb@titledate@style\@date\par}%     
+              \fi%
+              \end{center}\par  
+              {\jb@thanks@style\@thanks\par}
+              \ifx\@publishinfo\@empty%
+                {\vfil\null}%
+              \else% 
+                \vfill%
+                {\hfil\jb@publishinfo@style\@publishinfo\hfil}%
+                \ifx\@publishplace\@empty%
+                \else%
+                  {\vskip 1ex\hfil\jb@publishplace@style\@publishplace\hfil}%
+                \fi%
+              \fi%
+              \@emptytitles  
+            \end{titlepage}%
+          }%
+        \fi% if@ruwtitle
+      \fi% if@stgallen    
+    \fi% if@trier
+  \fi% if@goettingen
+\else % option 'notitlepage' is set - jurabook will terminate!
   \ClassError{jurabook}%
     {jurabook does not support the 'notitlepage' option.}%
     {Remove 'notitlepage' option or use the original book class.}%
@@ -816,7 +1022,7 @@
 }
 
 \providecommand{\onespacing}{% den Spass wieder zurueck auf einzeilig
-  \renewcommand{\baselinestretch}{\@ne}%
+  \renewcommand{\baselinestretch}{\m@ne}%
   \normalsize}
 
 
@@ -825,6 +1031,8 @@
 %========================================
 
 \newcounter{totalfootnotes}\setcounter{totalfootnotes}{\z@}
+\newif\if@infootnote
+\@infootnotefalse
 
 \newlength{\fnlabelwidth}
 \if@fncontinued
@@ -840,9 +1048,10 @@
     \stepcounter{totalfootnotes}%
     \renewcommand{\baselinestretch}{\@ne}% (nur) dieses hinzugefuegt fuer einzeilige Ausgabe
     \parindent 1em%
-    \noindent
+    \noindent%
+    \@infootnotetrue%
     \hb@xt@1.8em{\hss\@makefnmark}#1%
-    }
+    \@infootnotefalse}
 \else%
   \newlength{\fnmarksep} % Platz zwischen Fussnote und Fussnotentext
   \setlength{\fnmarksep}{3pt}%
@@ -862,7 +1071,7 @@
       \setlength{\topsep}{\z@}%
       \setlength{\partopsep}{\z@}%
       \footnotesize}%
-      \item[\@makefnmark\hfill]#1%
+      \item[\hfill\@makefnmark]\@infootnotetrue #1\@infootnotefalse%
     \end{list}%
     }
 \fi
@@ -885,14 +1094,14 @@
  twoside
  =======
   
- | gerade Seiten (even)            | ungerade Seiten (odd)            |
+ | Even:                           | Odd			                  |
  |                                 |                                  |
- | Seite      § x chapter          |           II. section      Seite |
+ | PageNo     § x chapter          |           II. section     PageNo |
  ----------------------------------------------------------------------
  |                                 |                                  |
  
  
- oneside (maybe pdf disk versions)
+ oneside (e.g. pdf screen versions)
  =======
 
  |                                 | 
@@ -903,7 +1112,7 @@
  |                                 |
  -----------------------------------
  |                                 |
- |             Seite               |
+ |            PageNo               |
 
 
  
@@ -913,28 +1122,35 @@
 
 \fi
 
-\newcommand*{\maketimename}{Stand:}
+\newcommand*{\jb@maketime@text}{\today}
+\newcommand*{\jb@maketimename@text}{Stand:}
+\newcommand*{\jb@maketime@style}{\small\itshape}
 
-\newcommand*{\@maketime}{\today}
 \newcommand{\setmaketime}[1]{%
-  \renewcommand{\@maketime}{#1}%
+  \ClassError{jurabook}%
+    {\protect\setmaketime is obsolete, please use \protect\setjbooktext{maketime}{mytext}}
+    {Use \protect\setjbooktext{maketime}{mytext}}
 }
 
 
-% adopted to fancyhdr v2.0
 \newcommand{\SetJuboPagestyle}{%
   \pagestyle{fancy}%
   \if@classiclayout
     \fancyhead{}
     \if@printmaketime
-      \fancyhead[LE,RO]{\jb@maketime@style\maketimename\space\@maketime}
+      \fancyhead[LE,RO]{\jb@maketime@style\jb@maketimename@text\space\jb@maketime@text}
     \fi
     \fancyfoot{}
     \fancyfoot[LE,RO]{\thepage}
     \renewcommand{\headrulewidth}{0pt}%
-  \else% Standard:
-    \def\chaptermark##1{\markboth {\jubo@chaptercomplete\quad ##1}{}}%
-    \def\sectionmark##1{\markright {\thesection\space ##1}}%
+  \else% 
+    \if@seminar
+      \def\sectionmark##1{\markboth{\thesection\space ##1}{\thesection\space ##1}}%
+      \def\subsectionmark##1{\markright{\thesubsection\space ##1}}%
+    \else%
+      \def\chaptermark##1{\markboth{\jubo@chaptercomplete\quad ##1}{}}%
+      \def\sectionmark##1{\markright{\thesection\space ##1}}%
+    \fi%
     \fancyhead{}
     \if@twoside
       \fancyhead[LE,RO]{\thepage}
@@ -942,14 +1158,14 @@
       \fancyhead[CO]{\rightmark}
       \fancyfoot{}
       \if@printmaketime
-        \fancyfoot[LE,RO]{\jb@maketime@style\maketimename\space\@maketime}
+        \fancyfoot[LE,RO]{\jb@maketime@style\jb@maketimename@text\space\jb@maketime@text}
       \fi
 %     \headrulewidth (Strich in der Kopfzeile) bleibt auf default wert 0.4pt
     \else
       \chead{\leftmark}
       \cfoot{\thepage}
       \if@printmaketime
-        \rfoot{\jb@maketime@style\maketimename\space\@maketime}
+        \rfoot{\jb@maketime@style\jb@maketimename@text\space\jb@maketime@text}
       \fi
     \fi
   \fi%
@@ -996,7 +1212,7 @@
 
 
 %========================================
-% Randnummern (= runners)
+% Runners
 %========================================
 
 % (siehe auch Begleiter 74)
@@ -1010,14 +1226,14 @@
 \renewcommand{\theextrarunner}{\therunner\alph{extrarunner}}
 
 % Wird beim Referenzieren benoetigt:
-\newcommand*{\rnname}{Rn.}
-\newcommand*{\jubopagename}{S.} 
+\newcommand*{\jb@rn@text}{Rn.}
+\newcommand*{\jp@page@text}{S.} 
 
-% Platz fuer Randnummer:
-\newlength{\oddmarginspace}
-\setlength{\oddmarginspace}{1em}
-\addtolength{\oddmarginspace}{-\marginparsep}
+% extraspace between text and runner
+%   text text text|--|12
 
+\newlength{\jb@runnersspace@length}
+\setlength{\jb@runnersspace@length}{.5em}%= 0.5quad
 
 \iffalse Randnnummer setzen
 
@@ -1033,16 +1249,16 @@
   \if@dorunners%
     \stepcounter{runner}%
     #2\marginpar%
-      [\hfill{{\bfseries\therunner}}\quad\quad]%   % Stimmt zwar, aber warum?!
-      {\quad {\bfseries\therunner}}%
+      [\hfill{\bfseries\therunner}\hspace*{\jb@runnersspace@length}]%
+      {\hspace*{\jb@runnersspace@length}{\bfseries\therunner}\hfill}%
 %   hiermit wird entsprechender Eintrag in die toc gesetzt:
     \protected@edef\@currentlabel{\therunner}%
-  \fi% dieses Kommentarzeichen MUSS hier hin, sonst gibt es unerwuenschte Leerzeichen!
+  \fi% do NOT delete the percentage sign
   \ifthenelse{\equal{#1}{\@empty}}%
     {}% nix
     %else
     {\label{#1}}%
-}    
+}
 
 
 \iffalse nachtraeglich Randnummer einfuegen (fuer 2. Auflage, sonst sinnlos)
@@ -1061,8 +1277,8 @@
 
 \newcommand*{\extrarn}[2][]{%
   \stepcounter{extrarunner}#2\marginpar%
-  [\hfill{\textbf{\theextrarunner}}\quad\quad]%   % Stimmt zwar, aber warum?!
-  {\quad \textbf{\theextrarunner}}%
+  [\hfill{\bfseries\theextrarunner}\hspace*{\jb@runnersspace@length}]%
+  {\hspace*{\jb@runnersspace@length}{\bfseries\theextrarunner}\hfill}%
 % hiermit entsprechender Eintrag in toc:
   \protected@edef\@currentlabel{\therunner\theextrarunner}
   \ifthenelse{\equal{#1}{\@empty}}%
@@ -1086,12 +1302,12 @@
 \newcommand{\rnref}[1]{%
   \if@dorunners%
     \if@rnrefbold% Paketoption 'rnefbold' = TRUE? 
-      {\bfseries \rnname~\ref{#1}}%
+      {\bfseries\jb@rn@text~\ref{#1}}%
     \else%
-      \rnname~\ref{#1}%
+      \jb@rn@text~\ref{#1}%
     \fi
   \else
-    \jubopagename~\ref{#1}%  
+    \jb@page@text~\ref{#1}%  
   \fi%
   }
   
@@ -1130,15 +1346,15 @@
 \newcommand{\jb@mainmatter}{%
   \cleardoublepage%
   \@mainmattertrue%
-  \setcounter{page}{\@ne}%
+  \setcounter{page}{\@ne}% 
   \pagenumbering{arabic}%
 }
 
 
 \newif\if@jubo@proofmode
 \@jubo@proofmodefalse
-\newlength{\proofmodetextwidth}
-\newlength{\proofmodeleftmargin}
+\newlength{\jb@proofmodetextwidth@length}
+\newlength{\jb@proofmodeleftmargin@length}
 
 \newlength{\jb@textwidth}
 \newlength{\jb@columnwidth}
@@ -1153,7 +1369,7 @@
   \ClassWarningNoLine{jurabook}%
      {\protect\mainmatter* command is switching to proof mode,\MessageBreak
       text will by typeset in a rather small column.\MessageBreak
-      (textwidth=\the\proofmodetextwidth)\MessageBreak
+      (textwidth=\the\jb@proofmodetextwidth@length)\MessageBreak
       From now on, EVERYTHING can happen ..}%
   \if@twoside
     \ClassWarningNoLine{jurabook}%
@@ -1169,13 +1385,13 @@
   \setlength{\jb@headwidth}{\headwidth}%
   \setlength{\jb@evensidemargin}{\evensidemargin}%
   \setlength{\jb@oddsidemargin}{\oddsidemargin}%
-  \setlength{\textwidth}{\proofmodetextwidth}%
+  \setlength{\textwidth}{\jb@proofmodetextwidth@length}%
   \setlength{\columnwidth}{\textwidth}%
   \setlength{\hsize}{\textwidth}%
   \setlength{\linewidth}{\textwidth}% 
   \setlength{\headwidth}{\textwidth}%
-  \setlength{\evensidemargin}{\proofmodeleftmargin}%
-  \setlength{\oddsidemargin}{\proofmodeleftmargin}%
+  \setlength{\evensidemargin}{\jb@proofmodeleftmargin@length}%
+  \setlength{\oddsidemargin}{\jb@proofmodeleftmargin@length}%
 }
 
 \renewcommand{\backmatter}{%
@@ -1236,14 +1452,14 @@
  (zur Loesung Begleiter 37 ff.)
 \fi
 
-\newcommand{\overviewname}{Inhalts\"ubersicht}
+\newcommand*{\jb@overview@text}{Inhalts\"ubersicht}
 \newcommand{\overview}{% geklaut aus book.cls, ohne \makeuppercase
   \if@twocolumn
     \@restonecoltrue\onecolumn
   \else
     \@restonecolfalse
   \fi%
-  \@chapter@withoutnumber@notoc{\overviewname}%
+  \@chapter@withoutnumber@notoc{\jb@overview@text}%
   \@starttoc{ovw}%
   \if@restonecol\twocolumn\fi%
 }
@@ -1340,7 +1556,7 @@
 \renewcommand{\@part}[2][]{%
   \ifnum \c@secnumdepth >-2\relax
     \refstepcounter{part}%
-    \if@centeredlayout%
+    \if@centeredpartsintoc%
       \addtocontents{toc}{\protect\@partlinecenter{\thepart\space\partname}{#2}}%
       \addtocontents{ovw}{\protect\@partlinecenter{\thepart\space\partname}{#2}}%
     \else%
@@ -1401,7 +1617,8 @@
 \newlength{\subfoursectionnumwidth}
 \newlength{\subfivesectionnumwidth}
 \newlength{\subsixsectionnumwidth}
-
+\newlength{\subsevensectionnumwidth}
+\newlength{\subeightsectionnumwidth}
 
 \newlength{\sectiontocindent}
 \newlength{\subsectiontocindent}
@@ -1410,13 +1627,17 @@
 \newlength{\subfoursectiontocindent}
 \newlength{\subfivesectiontocindent}
 \newlength{\subsixsectiontocindent}
+\newlength{\subsevensectiontocindent}
+\newlength{\subeightsectiontocindent}
+\newlength{\paragraphtocindent}
+\newlength{\subparagraphtocindent}
 
-\newlength{\defaulttocindent}
-\setlength{\defaulttocindent}{1.5em}
+\newlength{\jb@defaulttocindent@length}
+\setlength{\jb@defaulttocindent@length}{1.5em}
 
 
 % Folgendes wird auf jeden Fall in 
-% FinalJuboSettings / AtBeginDocument aufgerufen:
+% \Kickst@rt / AtBeginDocument aufgerufen:
 
 \newcommand{\jubo@settocindents}{%
   \if@chapterprefix%
@@ -1426,11 +1647,13 @@
   \fi%
   \settowidth{\sectionnumwidth}{VIII.\ }%
   \settowidth{\subsectionnumwidth}{88.\ }%
-  \settowidth{\subsubsectionnumwidth}{b).\ }%
+  \settowidth{\subsubsectionnumwidth}{b)\ }%
   \settowidth{\subthreesectionnumwidth}{bb)\ }%
   \settowidth{\subfoursectionnumwidth}{bbb)\ }%
   \settowidth{\subfivesectionnumwidth}{(88)\ }%
   \settowidth{\subsixsectionnumwidth}{(b)\ }%
+  \settowidth{\subsevensectionnumwidth}{(bb)\ }%
+  \settowidth{\subeightsectionnumwidth}{(bbb)\ }%
   \if@chapterprefix%
     \setlength{\sectiontocindent}{\chapternumwidth}%
   \else%
@@ -1438,7 +1661,7 @@
     \setlength{\sectiontocindent}{\@tempdima}%  
   \fi  
   \if@fixtocindent%
-    \setlength{\sectiontocindent}{\defaulttocindent}% = 1.5em per default
+    \setlength{\sectiontocindent}{\jb@defaulttocindent@length}% = 1.5em per default
   \fi%  
   \setlength{\subsectiontocindent}{\sectiontocindent}%
   \addtolength{\subsectiontocindent}{\sectionnumwidth}%
@@ -1452,6 +1675,18 @@
   \addtolength{\subfivesectiontocindent}{\subfoursectionnumwidth}%
   \setlength{\subsixsectiontocindent}{\subfivesectiontocindent}%
   \addtolength{\subsixsectiontocindent}{\subfivesectionnumwidth}%
+  
+  \setlength{\subsevensectiontocindent}{\subsixsectiontocindent}%
+  \addtolength{\subsevensectiontocindent}{\subsixsectionnumwidth}%
+  
+  \setlength{\subeightsectiontocindent}{\subsevensectiontocindent}%
+  \addtolength{\subeightsectiontocindent}{\subsevensectionnumwidth}%
+  
+  \setlength{\paragraphtocindent}{\subeightsectiontocindent}%
+  \addtolength{\paragraphtocindent}{\subeightsectionnumwidth}%
+  
+  \setlength{\subparagraphtocindent}{\paragraphtocindent}%
+  \addtolength{\subparagraphtocindent}{\jb@defaulttocindent@length}%
 }  
 
 
@@ -1488,32 +1723,15 @@
 % #2 -> chaptername (default: \textsection)
 
 \newcommand{\setchaptername}[2][]{%
-  \@ifpackageloaded{babel}%
-    {\iflanguage{german}%
-      {\addto\captionsgerman{\renewcommand{\chaptername}{#2}}%
-       \selectlanguage{german}%
-      }%
-      {\iflanguage{ngerman}%
-        {\addto\captionsngerman{\renewcommand{\chaptername}{#2}}%
-         \selectlanguage{ngerman}%
-        }%
-        {\ClassWarningNoLine{jurabook}%
-          {This class is designed for german documents only,\MessageBreak
-           so please select german or ngerman language option.}}%
-      }%           
-    }%
-    {% jurabook gibt zwar eine Meldung aus, macht dann aber ungeruehrt weiter ...
-     \@ifpackageloaded{german}%
-       {\relax}%
-       {\@ifpackageloaded{ngerman}%
-         {\relax}%
-         {\ClassWarningNoLine{jurabook}%
-            {This class is designed for german documents only,\MessageBreak
-             so please use 'german', 'ngerman' or 'babel' package}%
-         }%
-       }%
-     \renewcommand{\chaptername}{#2}%
-    }% 
+  \ifcase\value{jb@languageloaded}%
+    \addto\captionsgerman{\renewcommand{\chaptername}{#2}}%
+    \selectlanguage{german}%
+  \or%
+    \addto\captionsngerman{\renewcommand{\chaptername}{#2}}%
+    \selectlanguage{ngerman}%
+  \else%
+    \renewcommand{\chaptername}{#2}%
+  \fi%
   \renewcommand{\chapterextra}{#1}%
   \jubo@settocindents%
 } 
@@ -1560,14 +1778,15 @@
 
 \newcommand{\@@chapter}[2][]{%
   \stepcounter{realchapters}%
+  \setcounter{current@level}{\z@}%
   \ifnum \c@secnumdepth >\m@ne
     \if@mainmatter
       \make@jubo@chaptercomplete%
       \refstepcounter{chapter}%
       \if@chapterprefix%
-        \typeout{^^JChapter\space\thechapter\chapterextra^^J------------}%
+        \typeout{Chapter\space\thechapter\chapterextra}%
       \else
-        \typeout{^^J\thechapter.\space Chapter\chapterextra^^J------------}%
+        \typeout{\thechapter.\space Chapter\chapterextra}%
       \fi  
       \addcontentsline{toc}{chapter}{%
          \protect\numberline{\jubo@chaptercomplete}#2}%
@@ -1601,9 +1820,21 @@
 }
 
 
+% this is inserted before chapter's title is given out ...
+\newlength{\jb@chapterbefore@length}
+\setlength{\jb@chapterbefore@length}{50\p@}
+
+\newcommand{\chapterstartspace}{
+  \vspace*{\jb@chapterbefore@length}%
+}
+  
+% ... and this after chapter's title
+\newlength{\jb@chapterafter@length}
+\setlength{\jb@chapterafter@length}{40\p@}
+
 \renewcommand{\@makechapterhead}[1]{%
   \make@jubo@chaptercomplete%
-  \vspace*{50\p@}%
+  \chapterstartspace%
   \if@centeredlayout%
     {\centering \normalfont%
      \ifnum \c@secnumdepth >\m@ne
@@ -1619,7 +1850,7 @@
     }%
   \else%
     \settowidth{\@chaptercompletelength}{\huge\bfseries \jubo@chaptercomplete\quad}%
-    {\parindent \z@ \raggedright \normalfont%
+    {\parindent \z@ \jubo@csalign@hook \normalfont%
       \ifnum \c@secnumdepth >\m@ne% 
         \if@mainmatter%
           \begingroup%
@@ -1633,10 +1864,21 @@
       \fi%
     }%
   \fi%
-  \vskip 40\p@%  
+  \vspace*{\jb@chapterafter@length}%  
 }  
 
 
+% the following is need (at least) by 'theindex' environment (see below)
+
+\renewcommand{\@makeschapterhead}[1]{%
+  \chapterstartspace%
+  {\parindent \z@ \jubo@csalign@hook
+    \normalfont
+    \interlinepenalty\@M
+    \Huge\bfseries  #1\par\nobreak
+    \vspace*{\jb@chapterafter@length}%
+  }}
+
 %=====================================
 %               
 % \@chapter@withoutnumber{heading}
@@ -1650,7 +1892,7 @@
 
 
 \newcommand{\@chapter@withoutnumber}[1]{%
-  \typeout{^^J#1^^J------------}%
+  \typeout{#1}%
   \if@openright\cleardoublepage\else\clearpage\fi%
   \chapterlevel%
   \thispagestyle{empty}%
@@ -1681,7 +1923,7 @@
 %=====================================
 
 \newcommand{\@chapter@withoutnumber@notoc}[1]{%
-  \typeout{^^J#1^^J------------}%
+  \typeout{#1}%
   \if@openright\cleardoublepage\else\clearpage\fi%
   \chapterlevel%
   \thispagestyle{empty}%
@@ -1699,13 +1941,13 @@
 
 
 \newcommand{\@makechapterhead@withoutnumber}[1]{%
-  \vspace*{50\p@}%
+  \chapterstartspace%
   \if@centeredlayout%
     {\centering\normalfont\huge\bfseries #1\par}%
   \else%
     {\normalfont\huge\bfseries\noindent #1\par}%
   \fi%
-  \vskip 40\p@%
+  \vspace*{\jb@chapterafter@length}%%
 }
 
 
@@ -1794,7 +2036,7 @@
 
 \newcommand{\@@appendixchapter}[2][]{%
   \if@lonely@appchap%
-    \typeout{^^JLonely Appendix^^J------------}%
+    \typeout{Lonely Appendix ('\appendixname\space #2')}%
     \addcontentsline{toc}{extrajubostuff}{%
       \protect\numberline{}\appendixname\space #2}%
     \addcontentsline{ovw}{extrajubostuff}{% Overview
@@ -1802,7 +2044,7 @@
   \else%
     \ifnum \c@secnumdepth >\m@ne
       \refstepcounter{chapter}%
-      \typeout{^^JAppendix\space\thechapter^^J------------}%
+      \typeout{Appendix\space\thechapter}%
       \addcontentsline{toc}{appendixchapter}{%
         \protect\numberline{\appendixname\space\thechapter}#2}%
       \addcontentsline{ovw}{ovwappendixchapter}{% Overview
@@ -1833,7 +2075,7 @@
 
 
 \newcommand{\@makeappendixchapterhead}[1]{%
-  \vspace*{50\p@}%
+  \chapterstartspace%
   \if@centeredlayout%
     {\centering \normalfont
      \ifnum \c@secnumdepth >\m@ne
@@ -1859,7 +2101,7 @@
        \settowidth{\@chaptercompletelength}{\huge\bfseries\appendixname~\thechapter\quad}%
      \fi%
      \begingroup%
-       \parindent \z@ \raggedright \normalfont%
+       \parindent \z@ \jubo@csalign@hook \normalfont%
        \ifnum \c@secnumdepth >\m@ne
          \if@mainmatter
            \begingroup%
@@ -1876,7 +2118,7 @@
          \huge\bfseries #1  
        \fi%
      \endgroup%
-     \vskip 40\p@%
+     \vspace*{\jb@chapterafter@length}%
     }%
   \fi%
 }
@@ -1907,6 +2149,7 @@
 
 \def\@sect#1#2#3#4#5#6[#7]#8{%
   \stepcounter{totalsections}%
+  \setcounter{current@level}{#2}%
   \ifnum #2>\c@secnumdepth
     \let\@svsec\@empty
   \else
@@ -1918,7 +2161,7 @@
     \begingroup
       #6{%
         \@hangfrom{\hskip #3\relax\@svsec}%
-          \interlinepenalty \@M \raggedright #8\@@par}% linksbuendig!!!! NEU
+          \interlinepenalty \@M \jubo@csalign@hook #8\@@par}% linksbuendig!!!! NEU
     \endgroup
     \csname #1mark\endcsname{#7}%
     \addcontentsline{toc}{#1}{%
@@ -1974,8 +2217,8 @@
   \@xsect{#5}%
 }
 
-\setcounter{secnumdepth}{7}
-\setcounter{tocdepth}{7}
+\setcounter{secnumdepth}{9}
+\setcounter{tocdepth}{9}
 
 
 %========================================
@@ -2054,7 +2297,7 @@
 
 \newcounter{subsixsection}[subfivesection]
 \renewcommand{\thesubsixsection}%
-  {(\alph{subfivesection})}
+  {(\alph{subsixsection})}
 \let\subsixsectionmark\@gobble
 
 \newcommand*{\subsixsection}{\@startsection%
@@ -2067,10 +2310,49 @@
 \let\subsubsubsubsubsubsection\subsixsection
 
 
+
+%======================================================
+% subsevensection ("(aa) blubber")
+%======================================================
+
+\newcounter{subsevensection}[subsixsection]
+\renewcommand{\thesubsevensection}%
+  {(\alph{subsevensection}\alph{subsevensection})}
+\let\subsevensectionmark\@gobble
+
+\newcommand*{\subsevensection}{\@startsection%
+  {subsevensection}%
+  {8}%
+  {\z@}%
+  {-3.25ex\@plus -1ex \@minus -.2ex}%
+  {1.5ex \@plus .2ex}%
+  {\normalfont\normalsize\bfseries}}
+\let\subsubsubsubsubsubsubsection\subsevensection
+
+
+%======================================================
+% subeightsection ("(aaa) blubber")
+%======================================================
+
+\newcounter{subeightsection}[subsevensection]
+\renewcommand{\thesubeightsection}%
+  {(\alph{subeightsection}\alph{subeightsection}\alph{subeightsection})}
+\let\subeightsectionmark\@gobble
+
+\newcommand*{\subeightsection}{\@startsection%
+  {subeightsection}%
+  {9}%
+  {\z@}%
+  {-3.25ex\@plus -1ex \@minus -.2ex}%
+  {1.5ex \@plus .2ex}%
+  {\normalfont\normalsize\bfseries}}
+\let\subsubsubsubsubsubsubsubsection\subeightsection
+
+
 %=======================================================
 % paragraph 
 %
-% Setzt neue Gliedererungsstufe 6 
+% Setzt neue Gliedererungsstufe 10 
 % kommt nicht ins toc, tocdepth=5
 %=======================================================
 
@@ -2081,7 +2363,7 @@
 
 \renewcommand{\paragraph}{\@startsection%
   {paragraph}% #1
-  {8}% #2
+  {10}% #2
   {\z@}% #3
   {3.25ex \@plus1ex \@minus.2ex}% #4
   {-1em}% #5
@@ -2093,13 +2375,13 @@
 %=======================================================
 % subparagraph 
 %
-% Setzt neue Gliedererungsstufe 7 (kommt nicht ins toc)
+% Setzt neue Gliedererungsstufe 11 (kommt nicht ins toc)
 %=======================================================
 
 \renewcommand{\subparagraph}{\@startsection%
   {subparagraph}%
-  {9}%
-  {\parindent}%
+  {11}%
+  {\z@}%
   {3.25ex \@plus1ex \@minus .2ex}%
   {-1em}%
   {\normalfont\normalsize\bfseries}}
@@ -2107,12 +2389,10 @@
 
 %=====================================
 %               
-% toc/sub/levelup  
+% toc/sub/levelup/leveldown  
 %
 %=====================================
 
-\newcounter{max@level}\setcounter{max@level}{5}
-
 \newcounter{current@level}
 % 0 = chapter
 % 1 = section
@@ -2122,6 +2402,8 @@
 % 5 = subfoursection
 % 6 = subfivesection
 % 7 = subsixsection
+% 8 = subsevensection
+% 9 = subeightsection
 
 \newcommand{\toc}[2][]{%
   \ifcase \value{current@level}%
@@ -2133,26 +2415,38 @@
   \or \subfoursection[#1]{#2}%
   \or \subfivesection[#1]{#2}%
   \or \subsixsection[#1]{#2}%
+  \or \subsevensection[#1]{#2}%
+  \or \subeightsection[#1]{#2}%
   \else%
     \ClassError{jurabook}%
       {Too many \protect\sub\space commands\MessageBreak
-       (you are already on subsixsection level)}%
+       (you are already on subeightsection level)}%
       {Use \protect\levelup\space or contact juramisc@sodtalbers.de.}%   
   \fi%
 }  
   
 \newcommand{\levelup}{%
   \addtocounter{current@level}{\m@ne}%
-   \ifthenelse{\value{current@level}<\z@}%
+  \ifthenelse{\value{current@level}<\z@}%
     {\ClassError{jurabook}%
-      {You are on chapter level, you cannot use \protect\levelup.}%
+      {You are on chapter level, you cannot use \protect\levelup}%
       {Use \protect\part\space or check your sectioning.}%
     }%  
     {\relax}%
 }
 
+\newcommand{\leveldown}{%
+  \ifthenelse{\value{current@level}=9}%
+    {\ClassError{jurabook}%
+      {You are on the lowest level, you cannot use \protect\sub\space or \protect\leveldown\space here}
+      {Check your sectioning, use \protect\levelup\space or contact juramisc@sodtalbers.de.}%
+    }%
+    {\stepcounter{current@level}%
+    }%
+}
+
 \newcommand{\sub}[2][]{%
-  \stepcounter{current@level}%
+  \leveldown%
   \toc[#1]{#2}%  
 }  
 
@@ -2175,7 +2469,7 @@
       \parindent \z@ \rightskip \@tocrmarg % statt: \@pnumwidth
       \parfillskip -\@tocrmarg
       {\leavevmode
-       \large \bfseries #1\hfil \hb@xt@\@tocrmarg{\hss #2}}\par
+       {\large \bfseries #1}\hfil \hb@xt@\@tocrmarg{\hss #2}}\par
        \nobreak
          \global\@nobreaktrue
          \everypar{\global\@nobreakfalse\everypar{}}%
@@ -2202,13 +2496,13 @@
     \addvspace{6ex}%
     \begingroup
       \centering \normalfont 
-      {\Large\bfseries #1\par}
+      {\large\bfseries #1\par}
       \addvspace{2ex}
-      {\Large\bfseries #2\par}
+      {\large\bfseries #2\par}
       \addvspace{2ex}
     \endgroup
     \nopagebreak
-  \fi  
+  \fi
 }
 
 \renewcommand*\l@chapter[2]{%
@@ -2220,11 +2514,16 @@
       \parindent \z@%
       \rightskip \@tocrmarg % statt \@pnumwidth
       \parfillskip -\@tocrmarg
-      \leavevmode \bfseries
+      \leavevmode
       \advance\leftskip\@tempdima
       \hskip -\leftskip
-      #1\nobreak\hfil \nobreak\hb@xt@\@tocrmarg{\hss #2}\par
-      \penalty\@highpenalty
+      {\bfseries #1}\nobreak\leaders\hbox{$\m@th
+        \mkern \@dotsep mu\hbox{.}\mkern \@dotsep
+        mu$}\hfill
+     \nobreak
+     \hb@xt@\@pnumwidth{\hfil\normalfont #2}%
+     \par%
+     \penalty\@highpenalty%
     \endgroup
   \fi}
         
@@ -2246,13 +2545,21 @@
     \begingroup
       \parindent \z@ \rightskip \@tocrmarg % statt \@pnumwidth
       \parfillskip -\@tocrmarg
-      \if@secinovw
-        \leavevmode \bfseries
-      \fi  
+      \leavevmode 
       \advance\leftskip\@tempdima
       \hskip -\leftskip
-      #1\nobreak\hfil \nobreak\hb@xt@\@tocrmarg{\hss #2}\par
-      \penalty\@highpenalty
+      \if@secinovw%
+        {\bfseries #1}%
+      \else%
+        #1%
+      \fi%
+      \nobreak\leaders\hbox{$\m@th
+        \mkern \@dotsep mu\hbox{.}\mkern \@dotsep
+        mu$}\hfill
+     \nobreak
+     \hb@xt@\@pnumwidth{\hfil\normalfont #2}%
+     \par%
+     \penalty\@highpenalty%
     \endgroup
   \fi}
 
@@ -2266,11 +2573,16 @@
     \begingroup
       \parindent \z@ \rightskip \@tocrmarg % statt \@pnumwidth
       \parfillskip -\@tocrmarg
-      \leavevmode \bfseries
+      \leavevmode%
       \advance\leftskip\@tempdima
       \hskip -\leftskip
-      #1\nobreak\hfil \nobreak\hb@xt@\@tocrmarg{\hss #2}\par
-      \penalty\@highpenalty
+      {\bfseries #1}\nobreak\leaders\hbox{$\m@th
+        \mkern \@dotsep mu\hbox{.}\mkern \@dotsep
+        mu$}\hfill
+     \nobreak
+     \hb@xt@\@pnumwidth{\hfil\normalfont #2}%
+     \par%
+     \penalty\@highpenalty%
     \endgroup
   \fi}
 
@@ -2284,15 +2596,23 @@
       \settowidth\@tempdima{\appendixname~XX\space}%
     \fi%
     \begingroup
-      \parindent \z@ \rightskip \@tocrmarg % statt \@pnumwidth
+      \parindent \z@ \rightskip \@tocrmarg% statt \@pnumwidth
       \parfillskip -\@tocrmarg
-      \if@secinovw
-        \leavevmode \bfseries
-      \fi  
+      \leavevmode
       \advance\leftskip\@tempdima
       \hskip -\leftskip
-      #1\nobreak\hfil \nobreak\hb@xt@\@tocrmarg{\hss #2}\par
-      \penalty\@highpenalty
+      \if@secinovw%
+        {\bfseries #1}%
+      \else%
+        #1%
+      \fi%
+      \nobreak\leaders\hbox{$\m@th
+        \mkern \@dotsep mu\hbox{.}\mkern \@dotsep
+        mu$}\hfill
+     \nobreak
+     \hb@xt@\@pnumwidth{\hfil\normalfont #2}%
+     \par%
+     \penalty\@highpenalty%
     \endgroup
   \fi}
 
@@ -2303,7 +2623,10 @@
 \newcommand*{\l@subfoursection}{\@dottedtocline{5}{\subfoursectiontocindent}{\subfoursectionnumwidth}}
 \newcommand*{\l@subfivesection}{\@dottedtocline{6}{\subfivesectiontocindent}{\subfivesectionnumwidth}}
 \newcommand*{\l@subsixsection}{\@dottedtocline{7}{\subsixsectiontocindent}{\subsixsectionnumwidth}}
-
+\newcommand*{\l@subsevensection}{\@dottedtocline{8}{\subsevensectiontocindent}{\subsevensectionnumwidth}}
+\newcommand*{\l@subeightsection}{\@dottedtocline{9}{\subeightsectiontocindent}{\subeightsectionnumwidth}}
+\renewcommand*\l@paragraph{\@dottedtocline{10}{\paragraphtocindent}{0em}}
+\renewcommand*\l@subparagraph{\@dottedtocline{11}{\subparagraphtocindent}{0em}}
 
 \iffalse
 
@@ -2313,6 +2636,8 @@
   
 \fi
 
+\newcommand{\jb@tocextras@style}{\normalfont\mdseries}
+
 \newcommand*{\l@extrajubostuff}[2]{%
   \addpenalty{-\@highpenalty}%
   \vskip 1.0em \@plus\p@%
@@ -2321,11 +2646,16 @@
      \parindent \z@%
      \rightskip \@tocrmarg % not: \@pnumwidth
      \parfillskip -\@tocrmarg
-     \leavevmode \mdseries % not: bfseries
+     \leavevmode
      \advance\leftskip\@tempdima
      \hskip -\leftskip
-     #1\nobreak\hfil \nobreak\hb@xt@\@tocrmarg{\hss #2}\par
-     \penalty\@highpenalty
+     {\jb@tocextras@style #1}\nobreak\leaders\hbox{$\m@th
+        \mkern \@dotsep mu\hbox{.}\mkern \@dotsep
+        mu$}\hfill
+     \nobreak
+     \hb@xt@\@pnumwidth{\hfil\jb@tocextras@style #2}%
+     \par%
+     \penalty\@highpenalty%
    \endgroup%
 }
     
@@ -2355,21 +2685,7 @@
 \newcommand{\xref}[1]{% vereinfacht Zitierungen
   \ref{#1} auf S.~\pageref{#1}}
 
-
-% cf. the example in begleiter, p. 61
-\newcommand{\openquote}{\glqq}
-\newcommand{\closequote}{\grqq}
-
-\renewenvironment{quote}
-  {\vspace{2ex plus 3.0pt minus 5.0pt}
-   \begin{small}
-   \begingroup\leftskip=\parindent\rightskip=\parindent\noindent\llap{\openquote}\ignorespaces%
-  }%
-  {\unskip\closequote\par\endgroup
-   \end{small}
-   \vspace{2ex plus 3.0pt minus 5.0pt}%
-  }
-  
+ 
 
 %========================================
 %               
@@ -2380,7 +2696,46 @@
 % TLC 11.1.7 (p. 653); Begleiter 361 f.
 
 \newcommand{\Index}[1]{#1\index{#1}}
+
+% this is currently *not* working:
+\newcommand{\findexproofmode}{%
+  \ClassWarningNoLine{jurabook}%
+    {You switched to footnote index proofmode\MessageBreak
+     no index entries will be produced}
+  \renewcommand{\index}[1]{%
+    \if@infootnote
+      \ClassWarning{jurabook}%
+        {\protect\index\space inside a footnote}
+    \else    
+    \fi}%
+  \renewcommand{\Index}[1]{%
+    \if@infootnote
+      \ClassWarning{jurabook}%
+        {\protect\Index\space inside a footnote}
+    \else
+    \fi}
+}
+
+\newcommand{\FIndex}[1]{%
+  \if@infootnote%
+    #1\index{#1|textit}%
+  \else%
+    \ClassError{jurabook}%
+      {\protect\FIndex outside a footnote}%
+      {Use \protect\Index\space instead.}%
+  \fi}
+
+\newcommand{\findex}[1]{%
+  \if@infootnote%
+    \index{#1|textit}%
+  \else%
+    \ClassError{jurabook}%
+      {\protect\findex outside a footnote}%
+      {Use \protect\index\space instead.}%
+  \fi}
+
 \newcommand{\MIndex}[1]{#1\index{#1|textbf}}
+
 \newcommand{\seealso}[2]{\emph{\alsoname} #1}
 
 
@@ -2393,33 +2748,35 @@
 % 
 % manmac.tex (cf. TeXBook p. 423)
 
-\def\special@jb@hat{\ifmmode\def\next{^}\else\let\next=\index\fi\next}
-\def\special@jb@underscore{\ifmmode\def\next{_}\else\let\next=\Index\fi\next}
+
+\def\special@jb@hat{\ifmmode\def\jb@next{^}\else\let\jb@next=\index\fi\jb@next}
+%\def\special@jb@underscore{\ifmmode\def\jb@next{_}\else\let\jb@next=\Index\fi\jb@next}
 
 \newif\if@shortindexing
 
 \begingroup
   \catcode`\^\active
-  \catcode`\_\active
+% \catcode`\_\active
 
   \gdef\shortindexingon{%
      \@shortindexingtrue
      \chardef\old@jb@hatcode\catcode`\^\relax
-     \chardef\old@jb@underscorecode\catcode`\_\relax
+%    \chardef\old@jb@underscorecode\catcode`\_\relax
      \catcode`\^\active
-     \catcode`\_\active
+%    \catcode`\_\active
      \let\old@jb@hat ^%
-     \let\old@jb@underscore _%
+%    \let\old@jb@underscore _%
      \let^\special@jb@hat
-     \let_\special@jb@underscore}
+%    \let_\special@jb@underscore%
+}
 
   \gdef\shortindexingoff{%
      \if@shortindexing
        \@shortindexingfalse
        \let^\old@jb@hat
-       \let_\old@jb@underscore
+%      \let_\old@jb@underscore
        \catcode`\^\old@jb@hatcode
-       \catcode`\_\old@jb@underscorecode
+%      \catcode`\_\old@jb@underscorecode
      \fi}
 \endgroup
 
@@ -2436,50 +2793,61 @@
 \fi
 
 
-% Setting the index prologue
+% setting the index prologue
 
 \if@indexpagenumbers%
-  \newcommand*{\indexprologue}{Die Zahlen beziehen sich auf die jeweiligen Seiten.}
+  \newcommand{\jb@indexprologue@text}{Die Zahlen beziehen sich auf die jeweiligen Seiten.}
 \else  
-  \newcommand*{\indexprologue}{Die Zahlen verweisen auf die Randnummern.}
+  \newcommand{\jb@indexprologue@text}{Die Zahlen verweisen auf die Randnummern.}
 \fi  
-
+\newcommand{\jb@indexprologue@style}{\normalsize\itshape}
 \newcommand{\@indexprologue}{%
    \begingroup
-     \normalsize\itshape%
-     \indexprologue%
+     \jb@indexprologue@style%
+     \jb@indexprologue@text%
      \vspace{\bigskipamount}\vspace{\bigskipamount}\par
-   \endgroup%
+   \endgroup}
+
+\newcommand{\combinemarks}{%
+  \ifthenelse{\equal{\leftmark}{\rightmark}}%
+    {\rightmark}% if equal
+    {\rightmark--\leftmark}}% if not equal
+
+\newcommand{\@currentindexletter}{}
+\newcommand{\newindexletter}[1]{%
+  \renewcommand{\@currentindexletter}{#1}%
+  {\bfseries\large\hfill #1\hfill\smallskip}%
 }
 
+\renewcommand{\@idxitem}%
+  {\par\hangindent 40\p@\markboth{\@currentindexletter}{\@currentindexletter}}
+
 \iffalse
   Hier die entsprechende Umdefinierung 
   der 'index'-Umgebung, so dass der
-  IndexHint integriert wird.
+  index prologue integriert wird.
   
   vgl. a. Begleiter 378
 \fi
 
-\renewenvironment{theindex}{%
-  \if@twocolumn
-    \@restonecolfalse
-  \else
-    \@restonecoltrue
-  \fi
-  \columnseprule \z@
-  \columnsep 35\p@
-  \twocolumn[\@makeschapterhead{\indexname}%
-             \addcontentsline{toc}{extrajubostuff}{\numberline{}\indexname}%
-             \@indexprologue]%
-  \@mkboth{\indexname}% \MakeUppercase rausgenommen
-          {\indexname}%
-  \thispagestyle{empty}%
-  \parindent\z@
-  \parskip\z@ \@plus .3\p@\relax
-  \let\item\@idxitem%
+\newcommand{\jb@indextext@style}{\normalsize}
+
+\renewenvironment{theindex}%
+  {\columnseprule \z@
+   \columnsep 35\p@
+   \@chapter@withoutnumber{\indexname}%
+   \@indexprologue%
+   \pagestyle{fancy}%
+   \chead{\indexname\space (\combinemarks)}
+   \begin{multicols}{2}
+     \parindent\z@
+     \parskip\z@ \@plus .3\p@\relax
+     \jb@indextext@style%
+     \let\item\@idxitem%
   }%
-  {\if@restonecol\onecolumn\else\clearpage\fi%
-}
+  {\end{multicols}%
+  }  
+
 
 
 \iffalse
@@ -2500,7 +2868,7 @@
         {You are using an outdated version of the package 'jurabib'.}%
         {Get the latest version (>=0.6) of 'jurabib' from www.jurabib.org}%
       }%
-      {\ClassInfo{jurabook}{Changing jurabib's \protect\bib@heading\space command}%
+      {\ClassInfo{jurabook}{Redefining jurabib's \protect\bib@heading\space command}%
        \let\oldbib@heading\bib@heading%
        \renewcommand{\bib@heading}{%
          \@chapter@withoutnumber{\bibname}%
@@ -2571,9 +2939,9 @@
 
 \newcounter{totalwebcites}
 
-\newcommand*{\cwrevisionopen}{(}%        oeffnendes Zeichen fuer den Stand
-\newcommand*{\cwrevisionname}{Stand:}
-\newcommand*{\cwrevisionclose}{)}%       schliessendes Zeichen fuer den Stand
+\newcommand*{\jb@cwrevisionopen@text}{(}%   oeffnendes Zeichen fuer den Stand
+\newcommand*{\jb@cwrevision@text}{Stand:}
+\newcommand*{\jb@cwrevisionclose@text}{)}%  schliessendes Zeichen fuer den Stand
 
 \iffalse
 
@@ -2584,9 +2952,9 @@
 \fi
 
 \newcommand{\citeweb}{%
-    \@ifstar{\@@cws}{\@@cw}%
+  \@ifstar{\@@cws}{\@@cw}%
 }
-
+ 
 \newcommand{\@@cw}[3][]{%  
   \@citeweb[#1]{#2}%
   \if@dorunners%
@@ -2603,21 +2971,54 @@
 
 \newcommand{\@citeweb}[2][]{%
   \stepcounter{totalwebcites}%
-  \url{#2}\space%
+  \url{#2}%
   \if@suppresswebdates%
     \@gobble{#1}%
   \else%
-    \cwrevisionopen\cwrevisionname\space
+    \space\jb@cwrevisionopen@text\jb@cwrevision@text\space
     \ifthenelse{\equal{#1}{\@empty}}% 
       {\ClassWarning{jurabook}{No date in web citation -- replaced by current date}%
-       \number\day.~\number\month. \number\year\cwrevisionclose%
+       \number\day.~\number\month. \number\year\jb@cwrevisionclose@text%
       }% don't delete this percent character!
     % else    
-      {#1\cwrevisionclose}%
+      {#1\jb@cwrevisionclose@text}%
     % fi
-  \fi%      
+  \fi%  
 }
 
+% \citewebwithx[date]{urldef}{description}
+%               #1    #2      #3
+ 
+\newcommand{\citewebx}[3][]{%
+  \stepcounter{totalwebcites}%
+  \@ifundefined{#2}%
+    {\ClassError{jurabook}%
+      {Try to cite webaddress containing \#,\MessageBreak
+       but #2 not (url-)defined!}%
+      {Use \protect\urldef\space from url.sty.}%
+    }%   
+    {\relax}%
+  \csname #2\endcsname%
+  \if@suppresswebdates%
+    \@gobble{#1}%
+  \else%
+    \space\jb@cwrevisionopen@text\jb@cwrevision@text\space
+    \ifthenelse{\equal{#1}{\@empty}}% 
+      {\ClassWarning{jurabook}{No date in web citation -- replaced by current date}%
+       \number\day.~\number\month. \number\year\jb@cwrevisionclose@text%
+      }% don't delete this percent character!
+    % else    
+      {#1\jb@cwrevisionclose@text}%
+    % fi
+  \fi%
+  \if@dorunners%
+    \addtocontents{low}{\protect\lowcontentslinex{#2}{#3}{\therunner}}%
+  \else%
+    \addtocontents{low}{\protect\lowcontentslinex{#2}{#3}{\thepage}}%
+  \fi%
+}
+
+
 
 \iffalse
 
@@ -2631,39 +3032,58 @@
   \addtocontents{low}{\protect\lowcontentsline{#1}}%
 }
 
+
 \newcommand{\lowcontentsline}[3]{%
   \begingroup%
     \interlinepenalty\@M
-    \noindent \url{#1}\space\dotfill~#3\newline%
-    \noindent #2\par\smallskip%
+    \url{#1}\space\dotfill~#3\par%
+    {\setlength{\rightskip}{3em}#2\par}\smallskip%
+  \endgroup% 
+}
+
+
+\newcommand{\lowcontentslinex}[3]{%
+  \begingroup%
+    \interlinepenalty\@M
+    \csname #1\endcsname\space\dotfill~#3\par%
+    {\setlength{\rightskip}{3em}#2}\par\smallskip%
   \endgroup% 
 }
 
+
+\newcommand*{\jb@lowprologue@style}{\normalsize\itshape}
+
 \if@indexpagenumbers%
-  \newcommand*{\lowprologue}{Die Zahlen beziehen sich auf die jeweiligen Seiten.}
+  \newcommand*{\jb@lowprologue@text}{Die Zahlen beziehen sich auf die jeweiligen Seiten.}
 \else  
-  \newcommand*{\lowprologue}{Die Zahlen verweisen auf die Randnummern.}
+  \newcommand*{\jb@lowprologue@text}{Die Zahlen verweisen auf die Randnummern.}
 \fi
 
 \newcommand{\@lowprologue}{%
    \begingroup
-     \normalsize\itshape%
-     \lowprologue%
+     \jb@lowprologue@style%
+     \jb@lowprologue@text%
      \vspace{\bigskipamount}\vspace{\bigskipamount}\par
    \endgroup%
 }
 
 
-\newcommand*{\weblistname}{Quellen im World Wide Web}
+\newcommand*{\jb@lowname@text}{Quellen im World Wide Web}
+\newcommand*{\jb@lowtext@style}{\normalsize}
+
 \newcommand{\tableofwebcites}{% geklaut aus book.cls, ohne \makeuppercase
    \if@twocolumn
      \@restonecoltrue\onecolumn
    \else
      \@restonecolfalse
    \fi
-   \@chapter@withoutnumber{\weblistname}%
+   \@chapter@withoutnumber{\jb@lowname@text}%
    \@lowprologue%
-   \@starttoc{low}%
+   \begin{sloppypar}%
+     \jb@lowtext@style%
+     \setlength{\parindent}{0pt}
+     \@starttoc{low}%
+   \end{sloppypar}  
    \if@restonecol\twocolumn\fi%
 }
 
@@ -2679,9 +3099,9 @@
 \newif\if@notfinalsw        % Entsch nicht rechtskaeftig?
 \@notfinalswfalse
 
-\newcommand*{\dcssep}{--}
-\newcommand*{\decisionlistname}{Zitierte Entscheidungen}
-\newcommand*{\notfinalname}{(nicht rechtskr.)}
+\newcommand*{\jb@decisionsep@text}{--}
+\newcommand*{\jb@decisionlist@text}{Zitierte Entscheidungen}
+\newcommand*{\jb@notfinal@text}{(nicht rechtskr.)}
 
 \newcounter{totaldcs}
 \newcounter{totaldecisions}
@@ -2690,22 +3110,6 @@
 \newcommand{\decisionentry}[2]{}    % wird von \@starttoc benoetigt
 \@starttoc{dcs}                     % oeffnet \jobname.dcs
 
-% \if@indexpagenumbers%
-%  \newcommand*{\decisionhint}
-%    {Die Zahlen in den eckigen Klammern beziehen sich auf die jeweiligen Seiten.}
-% else  
-%   \newcommand*{\decisionhint}
-%    {Die Zahlen in den eckigen Klammern verweisen auf die Randnummern.}
-% \fi  
-
-% \newcommand{\@Decisionhint}{%
-%    {\normalsize\itshape
-%    \decisionhint%
-%    \bigskip\space\bigskip%
-%    }}
-
-\newcommand{\@Decisionhint}{\relax}
-
 
 \iffalse Befehl fuer Zitat innerhalb des Textes:
 
@@ -2725,10 +3129,10 @@
   {\itshape #2}\space #3%
   \ifthenelse{\equal{#4}{\@empty}}%
     {\ClassInfo{jurabook}{No keyword in \protect\dcs}}%
-    {\space\dcssep\space #4}%
+    {\space\jb@decisionsep@text\space #4}%
   \ifthenelse{\equal{#1}{\@empty}}%
     {\relax}%
-    {\space\notfinalname}%
+    {\space\jb@notfinal@text}%
   \if@dorunners%
     \addtocontents{dcs}{\protect\decisionentry{#4}{\therunner}}%
   \else
@@ -2746,29 +3150,40 @@
   \@dcs[nrkr]{#1}{#2}{#3}%
 }
 
-\newcommand{\dcshighlightfont}{\bfseries} % Hervorheben von Gericht und Fundstelle
+
+\newcommand{\jb@decisionprologue@style}{\normalsize\itshape}
+\newcommand{\jb@decisionprologue@text}{}
+
+\newcommand{\@decisionprologue}{%
+  \begingroup
+    \jb@decisionprologue@style%
+    \jb@decisionprologue@text%
+    \vspace{\bigskipamount}\vspace{\bigskipamount}\par
+  \endgroup%
+}
+
+
+\newcommand{\jb@decisiontext@style}{\small\raggedright}
 
 \newenvironment{decisionlist}
-  {\@indecisionlisttrue%
-   \@chapter@withoutnumber{\decisionlistname}%
-   \@Decisionhint%
-   \raggedright
-   \begin{small}
+  {\@indecisionlisttrue
+   \@chapter@withoutnumber{\jb@decisionlist@text}%
+   \@decisionprologue
+   \jb@decisiontext@style
    \begin{list}%
      {}%
      {\setlength{\leftmargin}{\z@}
       \setlength{\rightmargin}{\z@}
-      \setlength{\itemsep}{1ex}}
+      \setlength{\itemsep}{1ex}}%
   }
-  {\end{list}
-   \end{small}
-   \@indecisionlistfalse
+  {\end{list}%
+   \@indecisionlistfalse%
   }
-  
+ 
 
 \iffalse fuegt eine Entscheidung in die EntscheidungsLISTE ein:
 
- \@decision{gericht}{fundstelle}{stichwort}{datum}{az}{anmerkung}{nichtrechtskraeftig)
+ \@decision{gericht}{fundstelle}{stichwort}{datum}{az}{anmerkung}{nichtrechtskraeftig}{extra}
 
  #1: Gericht
  #2: Fundstelle
@@ -2777,23 +3192,29 @@
  #5: Aktenzeichen
  #6: Anmerkungen (werden nur dann NICHT ausgegeben, wenn Option 'decisionsfinal' eingeschaltet)
  #7: Urteil oder Beschluss (vom ...)
- #8: Entscheidung rechtskraeftig? (ja, wenn arg leer, sonst \notfinalname)
+ #8: Entscheidung rechtskraeftig? (ja, wenn arg leer, sonst \jb@notfinal@text)
+ #9: Extratext am Ende (fuer Randnummern zB)
   
 \fi
 
-\newcommand*{\decisionname}{Urt.}
-\newcommand*{\decreename}{Beschl.}
-\newcommand*{\decisionfromname}{v.}
+\newcommand*{\jb@decision@text}{Urt.}
+\newcommand*{\jb@decree@text}{Beschl.}
+\newcommand*{\jb@decisionfrom@text}{v.}
+
+\newcommand*{\jb@decisionemph@style}{\bfseries}% emphasize dcs
 
-\newcommand{\@decision}[8]{%
+\newcommand{\@decision}[9]{%
   \if@indecisionlist%
     \stepcounter{totaldcs}%
     \stepcounter{totaldecisions}%
     \ifthenelse{\equal{#8}{\@empty}}{\@notfinalswfalse}{\@notfinalswtrue}
-    \item {\dcshighlightfont #1}, #7\space\decisionfromname\space #4~\dcssep~#5\if@notfinalsw{\space\notfinalname ,}\else{,}\fi\space{\dcshighlightfont #2}%
+    \item {\jb@decisionemph@style #1}, #7\space\jb@decisionfrom@text\space #4~\jb@decisionsep@text~#5\if@notfinalsw{\space\jb@notfinal@text ,}\else{,}\fi\space{\jb@decisionemph@style #2}%
     \ifthenelse{\equal{#3}{\@empty}}%
       {\ClassInfo{jurabook}{No keyword in \protect\dcs}}%
-      {\space\mbox{\dcssep\space #3.}}%
+      {\space\mbox{\jb@decisionsep@text\space #3}}%
+    \ifthenelse{\equal{#9}{\@empty}}%
+      {}%
+      {\space #9}%
     \if@decisionhints%
       \ifthenelse{\equal{#6}{\@empty}}%
         {\relax}%
@@ -2813,35 +3234,46 @@
 
 
 \iffalse
-   \decision[Versaumnisurt.]{BGH}{NJW 2001, 964}{Kindertee IV}{12.12.2000}{VI ZR 345/99}{
-             #1              #2   #3             #4            #5          #6
-    Kv.
+   \decision[Versaumnisurt.]{BGH}{NJW 2001, 964}{Kindertee IV}{12.12.2000}{VI ZR 345/99}{extra}
+             #1              #2   #3             #4            #5          #6            #7
+    {Kv.
     Verjaehrung, gilt fuer jedes Organ der Gesellschaft separat.
     = ZIP 2001, 379??? mit Anm. Brueggemeier (Kv).}
-    #7
+    #8
 \fi
 
 \newcommand{\decision}{\@ifstar{\@@decs}{\@@dec}}  
 
-\newcommand{\@@dec}[7][\decisionname]{%
-  \@decision{#2}{#3}{#4}{#5}{#6}{#7}{#1}{}%
+\newcommand{\@@dec}[8][\jb@decision@text]{%
+  \@decision{#2}{#3}{#4}{#5}{#6}{#8}{#1}{}{#7}%
 }
 
-\newcommand{\@@decs}[7][\decisionname]{%
-  \@decision{#2}{#3}{#4}{#5}{#6}{#7}{#1}{nrkr}%
+\newcommand{\@@decs}[8][\jb@decision@text]{%
+  \@decision{#2}{#3}{#4}{#5}{#6}{#8}{#1}{nrkr}{#7}%
 }
 
+
+\iffalse
+   \decree{BGH}{NJW 2001, 964}{Kindertee IV}{12.12.2000}{VI ZR 345/99}{extra}{
+   {
+            #1  #2             #3            #4          #5            #6
+    Kv.
+    Verjaehrung, gilt fuer jedes Organ der Gesellschaft separat.
+    = ZIP 2001, 379??? mit Anm. Brueggemeier (Kv).}
+    #7
+\fi
+
 \newcommand{\decree}{\@ifstar{\@@dcrs}{\@@dcr}}
 
-\newcommand{\@@dcr}[6]{%
-  \@decision{#1}{#2}{#3}{#4}{#5}{#6}{\decreename}{}%
+\newcommand{\@@dcr}[7]{%
+  \@decision{#1}{#2}{#3}{#4}{#5}{#7}{\jb@decree@text}{}{#6}%
 }
 
-\newcommand{\@@dcrs}[6]{%
-  \@decision{#1}{#2}{#3}{#4}{#5}{#6}{\decreename}{nrkr}%
+\newcommand{\@@dcrs}[7]{%
+  \@decision{#1}{#2}{#3}{#4}{#5}{#7}{\jb@decree@text}{nrkr}{#6}%
 }  
 
-\newcommand{\@@notyet}[7][marillion]{%
+\newcommand{\@@notyet}[8][marillion]{%
   \ClassInfo{jurabook}{decision in list but not cited in text}% 'on inpute line xx'
   \stepcounter{totaldcs}%
   \stepcounter{totalnotyets}%
@@ -2855,5 +3287,10 @@
   \space\bigskip%
 }
 
+
+% visual formatting, TLC2 p. 234
+\newcommand{\longpage}[1][1]{\enlargethispage{#1\baselineskip}}
+\newcommand{\shortpage}[1][1]{\enlargethispage{-#1\baselineskip}}
+
 \endinput
 % end of jurabook.cls