Merge pull request #9 from marsgui/master

Make TOC more compact + endnotes more pretty.

diff --git a/data/dblatex-endnotes.xsl b/data/dblatex-endnotes.xsl
index 119022f426163dbb0d22889e82f1ddb99c92f7b5..5253af9e880c828ccb9340ba36ccf197a87709b6 100644 (file)
--- a/data/dblatex-endnotes.xsl
+++ b/data/dblatex-endnotes.xsl
@@ -12,7 +12,11 @@ in front of it.
     <xsl:text>
 \usepackage{endnotes}
 \let\footnote=\endnote
-\def\enoteheading{\mbox{}\par\vskip-\baselineskip }
+\def\enoteheading{\mbox{}\par\vskip-0.2\baselineskip }
+
+% More pretty looking note
+\def\enoteformat{\rightskip=0pt \leftskip=21pt \parindent=-13pt
+\leavevmode\llap{\makeenmark}\hspace*{11pt}}
 
 % Increase footnote/endnote size to be more than 6 pts, to avoid
 % complaint from Lulu about the font being too small to be printed
@@ -28,10 +32,6 @@ in front of it.
 % latex.begindocument can be active.
 \sloppy
 
-% Hack to get correct chapter numbering with dblatex, as chapter
-% labels are ignored.
-\setcounter{chapter}{-1}
-
 \begin{document}
     </xsl:text>
 

diff --git a/myclass.cls b/myclass.cls
index 95e2604b934bbc6de61efe3440da5b4135ee3e9b..546c27ea9cf2e326978cca0c31198447af8eb14b 100644 (file)
--- a/myclass.cls
+++ b/myclass.cls
@@ -83,7 +83,7 @@
 % Make TOC entries without label
 \titlecontents{chapter} %
 [1.5em] % 
-{\addvspace{1em plus 0pt}\bfseries} %
+{\addvspace{0.3em plus 0pt}\bfseries} %
 {\hspace{-1.3em}} % no number, remove room reserved for it 
 {\hspace{-1.3em}} %
 {\hfill \contentspage} % dots and page number
@@ -96,7 +96,6 @@
 {0.75em} % space between dots
 [\addvspace{0pt}]
 
-
 %% Redefines the headings to remove the chapter label
 \titleformat{\chapter}[block]
 {\filcenter\Large}{\filcenter}{20pt}{\Large}
@@ -106,6 +105,22 @@
 
 \titleformat{\subsection}
 {\filcenter\large\bfseries}{\thesubsection}{1em}{}
+
+%% New header, behaving like a chapter but formatted differently
+\titleclass{\lotheader}{top}[\part]
+\newcounter{lotheader}
+\renewcommand{\thelotheader}{\Alph{lotheader}}
+
+\titleformat{\lotheader}[block]
+{\filcenter\huge}{\filcenter}{20pt}{\Huge}
+\titlespacing*{\lotheader}{0pt}{-30pt}{40pt}
+
+% Use the new header in TOC
+\let\stdtoc=\tableofcontents
+\let\stdchapter=\chapter
+\def\tableofcontents{\let\chapter\lotheader \stdtoc{} \let\chapter\stdchapter}
+
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 % From