yet another fix for slowo_obce + refactor

[librarian.git] / librarian / pdf / wl.cls

diff --git a/librarian/pdf/wl.cls b/librarian/pdf/wl.cls
index 5603a0e..ff6e2b0 100644 (file)
--- a/librarian/pdf/wl.cls
+++ b/librarian/pdf/wl.cls
@@ -12,6 +12,7 @@
 % a4paper,... - paper size as required by LaTeX
 % nowlfont - don't use customized WL font
 
 % a4paper,... - paper size as required by LaTeX
 % nowlfont - don't use customized WL font
 

+\RequirePackage{fixltx2e}

 \RequirePackage{setspace}
 \RequirePackage{type1cm}
 \DeclareOption{13pt}{%
 \RequirePackage{setspace}
 \RequirePackage{type1cm}
 \DeclareOption{13pt}{%


@@ -59,6 +60,9 @@
 \newif\ifenablewlfont \enablewlfonttrue
 \DeclareOption{nowlfont}{\enablewlfontfalse}
 
 \newif\ifenablewlfont \enablewlfonttrue
 \DeclareOption{nowlfont}{\enablewlfontfalse}
 

+\newif\ifshowtoc \showtoctrue
+\DeclareOption{notoc}{\showtocfalse}
+

 \DeclareOption*{\PassOptionsToClass{\CurrentOption}{book}}
 \ProcessOptions\relax
 \LoadClass[a4paper,oneside]{book}
 \DeclareOption*{\PassOptionsToClass{\CurrentOption}{book}}
 \ProcessOptions\relax
 \LoadClass[a4paper,oneside]{book}


@@ -331,24 +335,49 @@ Letters={Uppercase}
 }
 
 
 }
 
 

+\DeclareRobustCommand\authortoctext[1]{%
+{\addvspace{10pt}\nopagebreak\leftskip0em\relax
+\rightskip \@tocrmarg\relax
+\noindent\itshape#1\par}}
+
+\newcommand\authortoc[1]{%
+  \gdef\chapterauthor{#1}%
+  \addtocontents{toc}{\authortoctext{#1}}}
+
+

 \newcommand{\tytul}[1]{%
 #1%
 \vspace{1em}%
 }
 
 \newcommand{\tytul}[1]{%
 #1%
 \vspace{1em}%
 }
 

-\newcommand{\nazwapodutworu}[1]{%
+\newcommand{\nazwapodutworu}[2]{%
+\vspace{5ex}%

 \section*{\typosection{#1}}%
 \section*{\typosection{#1}}%

+\addcontentsline{toc}{section}{#2}%
+}
+
+\newcommand{\nazwanadpodutworu}[2]{%
+\authortoc{}%
+\nazwapodutworu{#1}{#2}%
+\authortoc{}%

 }
 
 \newcommand{\autorutworu}[1]{%
 \subsection*{\typosubsection{#1}}%
 }
 
 }
 
 \newcommand{\autorutworu}[1]{%
 \subsection*{\typosubsection{#1}}%
 }
 

+\newcommand{\autorpodutworu}[1]{%
+\vspace{5ex}%
+\subsection*{\typosubsection{#1}}%
+\authortoc{#1}%
+}
+

 \newcommand{\dzielonadrzedne}[1]{%
 \subsection*{\typosubsubsection{#1}}%
 }
 
 \newcommand{\nazwautworu}[1]{%
 \newcommand{\dzielonadrzedne}[1]{%
 \subsection*{\typosubsubsection{#1}}%
 }
 
 \newcommand{\nazwautworu}[1]{%

+\vspace{5ex}%

 \section*{\typosection{#1}}%
 }
 
 \section*{\typosection{#1}}%
 }
 


@@ -370,7 +399,8 @@ Letters={Uppercase}
 \newcommand{\dramatwspolczesny}[1]{#1}
 
 \newcommand{\nota}[1]{%
 \newcommand{\dramatwspolczesny}[1]{#1}
 
 \newcommand{\nota}[1]{%

-\par{#1}%
+\par{\raggedleft \emph{#1}}%
+\vspace{5ex}%

 }
 
 \newcommand{\dedykacja}[1]{%
 }
 
 \newcommand{\dedykacja}[1]{%


@@ -440,10 +470,14 @@ Letters={Uppercase}
 }
 
 \newcommand{\ramka}[1]{%
 }
 
 \newcommand{\ramka}[1]{%

+\par\vspace{1em}%
+\edef\myindent{\the\parindent}%

 \noindent\myfbox{1em}{1em}{%
 \noindent\myfbox{1em}{1em}{%

-\parbox{\textwidth}{%
+\parbox{\dimexpr \textwidth - 2\fboxhsep - 2\fboxrule\relax}{%
+\setlength{\parindent}{\myindent}%

 #1%
 }}%
 #1%
 }}%

+\vspace{1em}%

 }
 
 \newcommand{\dlugicytat}[1]{%
 }
 
 \newcommand{\dlugicytat}[1]{%


@@ -474,34 +508,43 @@ Letters={Uppercase}
 }
 
 \newcommand{\listaosoba}[1]{%
 }
 
 \newcommand{\listaosoba}[1]{%

-\item{#1}%
+\item[]{#1}%

 }
 
 \newcommand{\kwestia}[1]{%
 \par{#1}%
 }
 
 }
 
 \newcommand{\kwestia}[1]{%
 \par{#1}%
 }
 

-\newcommand{\naglowekakt}[1]{%
+\newcommand{\naglowekakt}[2]{%

 \pagebreak
 \pagebreak

-\subsection*{\typosubsection{#1}}%
+\subsection*{\typosubsection{\huge #1}}%
+\addcontentsline{toc}{subsection}{#2}%
+\vspace{5ex}%

 }
 }

-\newcommand{\naglowekczesc}[1]{%
+\newcommand{\naglowekczesc}[2]{%

 \pagebreak
 \pagebreak

-\subsection*{\typosubsection{#1}}%
+\subsection*{\typosubsection{\huge #1}}%
+\addcontentsline{toc}{subsection}{#2}%
+\vspace{5ex}%

 }
 \newcommand{\srodtytul}[1]{%
 \subsection*{\typosubsection{#1}}%
 }
 
 }
 \newcommand{\srodtytul}[1]{%
 \subsection*{\typosubsection{#1}}%
 }
 

-\newcommand{\naglowekscena}[1]{%
-\subsubsection*{\typosubsubsection{#1}}%
+\newcommand{\naglowekscena}[2]{%
+\subsubsection*{\typosubsubsection{\LARGE #1}}%
+\addcontentsline{toc}{subsubsection}{#2}%
+\vspace{5ex}%

 }
 }

-\newcommand{\naglowekrozdzial}[1]{%
-\subsubsection*{\typosubsubsection{#1}}%
+\newcommand{\naglowekrozdzial}[2]{%
+\subsubsection*{\typosubsubsection{\LARGE #1}}%
+\addcontentsline{toc}{subsubsection}{#2}%
+\vspace{5ex}%

 }
 
 \newcommand{\naglowekosoba}[1]{%
 }
 
 \newcommand{\naglowekosoba}[1]{%

-\par{\textsc{#1}}\nopagebreak%
+\medskip%
+\par{\textsc{\MakeLowercase{#1}}}\nopagebreak%

 }
 \newcommand{\naglowekpodrozdzial}[1]{%
 \vspace{5ex}\par{#1}\nopagebreak%
 }
 \newcommand{\naglowekpodrozdzial}[1]{%
 \vspace{5ex}\par{#1}\nopagebreak%


@@ -605,7 +648,7 @@ Letters={Uppercase}
 }
 
 \newcommand{\osoba}[1]{%
 }
 
 \newcommand{\osoba}[1]{%

-#1%
+{\scshape \MakeLowercase{#1}}%

 }
 
 \newcommand{\sekcjaswiatlo}{%
 }
 
 \newcommand{\sekcjaswiatlo}{%