missing conflicts

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

diff --git a/librarian/pdf/wl.cls b/librarian/pdf/wl.cls
index 247116c..cb605a1 100644 (file)
--- a/librarian/pdf/wl.cls
+++ b/librarian/pdf/wl.cls
@@ -67,14 +67,16 @@
 
 
 \usepackage{trace}
 
 
 \usepackage{trace}

-
-%\usepackage[MeX]{polski}
-
+\usepackage{caption}
+\usepackage{tabularx}
+\usepackage[MeX]{polski}
+\usepackage{icomma}

 \usepackage[xetex]{graphicx}
 \usepackage{fontspec}
 \usepackage{xunicode}
 \usepackage{xltxtra}
 
 \usepackage[xetex]{graphicx}
 \usepackage{fontspec}
 \usepackage{xunicode}
 \usepackage{xltxtra}
 

+

 \usepackage[overload]{textcase}
 \usepackage{scalefnt}
 \usepackage[colorlinks=true,linkcolor=black,setpagesize=false,urlcolor=black,xetex]{hyperref}
 \usepackage[overload]{textcase}
 \usepackage{scalefnt}
 \usepackage[colorlinks=true,linkcolor=black,setpagesize=false,urlcolor=black,xetex]{hyperref}


@@ -152,6 +154,7 @@ Letters={SmallCaps,UppercaseSmallCaps}
 \fancyhf{}
 \renewcommand{\headrulewidth}{0pt}
 \renewcommand{\footrulewidth}{0pt}
 \fancyhf{}
 \renewcommand{\headrulewidth}{0pt}
 \renewcommand{\footrulewidth}{0pt}

+

 %\lfoot{{\footnotesize \textsc{\@author} \emph{\@title}}}
 \cfoot{}
 %\rfoot{{\footnotesize \thepage}}
 %\lfoot{{\footnotesize \textsc{\@author} \emph{\@title}}}
 \cfoot{}
 %\rfoot{{\footnotesize \thepage}}


@@ -175,6 +178,7 @@ Letters={SmallCaps,UppercaseSmallCaps}
 
 \newcommand{\makecover}[2]{
 
 
 \newcommand{\makecover}[2]{
 

+

         %\pdfpagewidth=#1
         %\pdfpageheight=#2
 
         %\pdfpagewidth=#1
         %\pdfpageheight=#2
 


@@ -191,6 +195,7 @@ Letters={SmallCaps,UppercaseSmallCaps}
         \addtolength{\PictVOffset}{\headheight}
         \addtolength{\PictVOffset}{\headsep}
         \addtolength{\PictVOffset}{\topskip}
         \addtolength{\PictVOffset}{\headheight}
         \addtolength{\PictVOffset}{\headsep}
         \addtolength{\PictVOffset}{\topskip}

+

         \addtolength{\PictVOffset}{-#2}
 
         \noindent\hspace*{-\PictHOffset}%
         \addtolength{\PictVOffset}{-#2}
 
         \noindent\hspace*{-\PictHOffset}%