Removed unwanted TOC/chapter number adjustments.

diff --git a/data/user_param.xsl b/data/user_param.xsl
index f2f0b17b856642d00a8b889643ecaa354e8f1a0c..6bdd5c246eb2a7701d4efda714288e82ec66cf24 100644 (file)
--- a/data/user_param.xsl
+++ b/data/user_param.xsl
@@ -26,11 +26,6 @@
 
   <xsl:param name="local.l10n.xml" select="document('')"/> 
   <l:i18n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0">
 
   <xsl:param name="local.l10n.xml" select="document('')"/> 
   <l:i18n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0">

-    <!-- Drop the number in front of chapters -->
-    <l:context name="title-numbered">
-      <l:template name="chapter" text="%t"/>
-    </l:context>
-

     <l:l10n language="en">
       <!-- The default page citation [12] is hard to understand for
            most readers.  use (p. 12) instead. -->
     <l:l10n language="en">
       <!-- The default page citation [12] is hard to understand for
            most readers.  use (p. 12) instead. -->

diff --git a/myclass.cls b/myclass.cls
index 73d08698f7d30afcb55b35c0b9f5cb7abbf7577d..379eeab86eb179fa55f7ad2bb8700901989460c9 100644 (file)
--- a/myclass.cls
+++ b/myclass.cls
@@ -47,34 +47,6 @@
 \renewcommand\subitem{\@idxitem \hspace*{10\p@}}
 \renewcommand\subsubitem{\@idxitem \hspace*{15\p@}}
 
 \renewcommand\subitem{\@idxitem \hspace*{10\p@}}
 \renewcommand\subsubitem{\@idxitem \hspace*{15\p@}}
 

-% Put the index in the TOC
-\let\stdindex=\theindex
-\let\endstdindex=\endtheindex
-\renewenvironment{theindex}{
-  \begin{stdindex}
-  \@ifundefined{chapter}{}{
-    % To not have the number, replace by:
-    % \addcontentsline{toc}{chapter}{\numberline{}\indexname}
-    \refstepcounter{chapter}
-    \ifnum \c@secnumdepth >\z@
-      \ifnum \value{part} >\z@
-        \addcontentsline{toc}{part}{\numberline{\thechapter}\hspace{-1em}\indexname}
-      \else
-        \addcontentsline{toc}{chapter}{\numberline{\thechapter}\indexname}
-      \fi
-    \else
-      \addcontentsline{toc}{chapter}{\indexname}
-    \fi
-  }
-  % Adapt the vertical sizes to the smaller font
-  \setlength{\baselineskip}{0.7\baselineskip}%
-  \setlength{\parskip}{0.2\baselineskip}%
-  \indexfont
-}{
-  \end{stdindex}
-}
-\makeatother
-

 \newenvironment{colophon}{
   \pagebreak %
 % FIXME change when page size changes, use {x}{x*1.2}
 \newenvironment{colophon}{
   \pagebreak %
 % FIXME change when page size changes, use {x}{x*1.2}


@@ -90,86 +62,6 @@
 }{}
  
 
 }{}
  
 

-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Based on ideas from https://bugs.debian.org/684772
-\usepackage{titlesec}
-\usepackage{titletoc}
-%
-% Useless with unnumbered sections (e.g. use of \setcounter{secnumdepth}{0})
-%
-%
-\newcommand\makeletterof[1]{%
-\ifthenelse{\equal{#1}{1}}{EN}{%
-\ifthenelse{\equal{#1}{2}}{TO}{%
-\ifthenelse{\equal{#1}{3}}{TRE}{%
-\ifthenelse{\equal{#1}{4}}{FIRE}{%
-\ifthenelse{\equal{#1}{5}}{FEM}{%
-\ifthenelse{\equal{#1}{6}}{SEKS}{%
-\ifthenelse{\equal{#1}{7}}{SJU}{%
-\ifthenelse{\equal{#1}{8}}{ÅTTE}{%
-\ifthenelse{\equal{#1}{9}}{NI}{%
-\ifthenelse{\equal{#1}{10}}{TI}{%
-\ifthenelse{\equal{#1}{11}}{ELLEVE}{%
-\ifthenelse{\equal{#1}{12}}{TOLV}{%
-#1}}}}}}}}}}}}}
-
-% Make TOC entries without label
-\titlecontents{chapter} %
-[1.5em] % 
-{\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
-[\addvspace {0pt}]
-
-\dottedcontents{section} %
-[0em] % was (3.8)
-{\addvspace{0pt}} % 
-{2.3em} % tab
-{0.75em} % space between dots
-[\addvspace{0pt}]
-
-%% Redefines the headings to remove the chapter label
-\titleformat{\chapter}[block]
-{\filcenter\Large}{\filcenter}{20pt}{\Large}
-
-\titleformat{\section}
-{\filcenter\Large\bfseries}{\thesection}{1em}{}
-
-\titleformat{\subsection}
-{\filcenter\large\bfseries}{\thesubsection}{1em}{}
-
-%% New header, behaving like a section but formatted differently
-\titleclass{\enoteheader}{straight}[\chapter]
-\newcounter{enoteheader}
-\renewcommand{\theenoteheader}{\Alph{enoteheader}}
-
-\titleformat{\enoteheader}
-{\normalfont\large}{}{0pt}{}
-\titlespacing*{\enoteheader}{0pt}{2.5ex plus 1ex minus .2ex}{1.3ex plus .2ex}
-
-\dottedcontents{enoteheader} %
-[0em] % was (3.8)
-{\addvspace{0pt}} % 
-{2.3em} % tab
-{0.75em} % space between dots
-[\addvspace{0pt}]
-
-%% 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
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 % From