various pdf fixes

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

diff --git a/librarian/pdf/wl.cls b/librarian/pdf/wl.cls
index 9e5e6be..c04a8c8 100755 (executable)
--- a/librarian/pdf/wl.cls
+++ b/librarian/pdf/wl.cls
@@ -75,21 +75,22 @@
 \usepackage[overload]{textcase}
 \usepackage{scalefnt}
 % TODO: link color is a style thing
-\usepackage[colorlinks=true,linkcolor=black,setpagesize=false,urlcolor=black,xetex]{hyperref}
+\usepackage[hyphens]{url}
+\usepackage[colorlinks=true,linkcolor=black,setpagesize=false,urlcolor=blue,xetex]{hyperref}
 
 \ifenablewlfont
 \setmainfont [
 %ExternalLocation,
-UprightFont = JunicodeWL-Regular,
-ItalicFont = JunicodeWL-Italic,
-BoldFont = JunicodeWL-Regular,
-BoldItalicFont = JunicodeWL-Italic,
-SmallCapsFont = JunicodeWL-Regular,
+UprightFont = Dosis-Regular,
+ItalicFont = Dosis-SemiBold,
+BoldFont = Dosis-Bold,
+BoldItalicFont = Dosis-Bold,
+SmallCapsFont = Dosis-Regular,
 SmallCapsFeatures = {Letters={SmallCaps,UppercaseSmallCaps}},
 Numbers=OldStyle,
 Scale=1.04,
 LetterSpace=-1.0
-] {JunicodeWL}
+] {Dosis}
 
 \newfontfamily\alien[
 SmallCapsFeatures = {Letters={SmallCaps,UppercaseSmallCaps}},
@@ -149,7 +150,7 @@ Letters={SmallCaps,UppercaseSmallCaps}
 \fancyhf{}
 \renewcommand{\headrulewidth}{0pt}
 \renewcommand{\footrulewidth}{0pt}
-\lfoot{{\footnotesize \textsc{\@author} \emph{\@title}}}
+\lfoot{{\footnotesize \@author{} \emph{\@title}}}
 \cfoot{}
 \rfoot{{\footnotesize \thepage}}
 
@@ -171,7 +172,7 @@ Letters={SmallCaps,UppercaseSmallCaps}
 
 
 \newcommand{\typosubsubsection}[1]{%
-{\textsc{#1}}
+{#1}
 }
 
 \newcommand{\typosubsection}[1]{%
@@ -294,7 +295,7 @@ Letters={Uppercase}
 \subsubsection*{\typosubsubsection{#1}}%
 }
 \newcommand{\naglowekrozdzial}[1]{%
-\subsubsection*{\typosubsubsection{#1}}%
+{\raggedright\subsubsection*{\typosubsubsection{#1}}}%
 }
 
 \newcommand{\naglowekosoba}[1]{%
@@ -405,16 +406,3 @@ Letters={Uppercase}
 }%
 \fi
 }
-
-%% EDUMED SPECIFIC
-
-\newcommand{\activitycounter}[1]{\vspace{1em}\par{\huge{#1}}}
-
-\newcommand{\activityinfo}[1]{\begin{flushright}\parbox[t]{2in}{#1}\end{flushright}}
-\newcommand{\activitytime}[1]{Czas: #1 min \\}
-\newcommand{\activityform}[1]{Forma: #1 \\}
-\newcommand{\activitytools}[1]{#1 \\}
-
-\newcommand*\checkbox{\item[\Square]}
-\newcommand*\radio{\item[\Circle]}
-