X-Git-Url: https://git.mdrn.pl/librarian.git/blobdiff_plain/150976c77711deb71e0796e8067809d2a7b709ac..f0c23b2e3a1a1d7f37d9f00118632d116b3c8582:/librarian/pdf/wl.sty

diff --git a/librarian/pdf/wl.sty b/librarian/pdf/wl.sty
index 579ee7f..a7a97ba 100644
--- a/librarian/pdf/wl.sty
+++ b/librarian/pdf/wl.sty
@@ -8,6 +8,8 @@
 \usepackage{xltxtra}
 
 \usepackage[overload]{textcase}
+\usepackage{scalefnt}
+\usepackage[colorlinks=true,linkcolor=black,urlcolor=black]{hyperref}
 
 \setmainfont [
 %ExternalLocation,
@@ -22,6 +24,14 @@ Scale=1.04,
 LetterSpace=-1.0
 ] {JunicodeWL}
 
+\newfontfamily\alien[
+SmallCapsFeatures = {Letters={SmallCaps,UppercaseSmallCaps}},
+Numbers=OldStyle,
+Scale=0.85,
+LetterSpace=-1.0
+] {DejaVu Serif}
+
+
 \defaultfontfeatures{
 SizeFeatures={
   {Size={-10}, FakeStretch=1.02, LetterSpace=2.0 },
@@ -78,6 +88,19 @@ Letters={SmallCaps,UppercaseSmallCaps}
 \clubpenalty=100000
 \widowpenalty=100000
 
+
+% see http://osdir.com/ml/tex.xetex/2005-10/msg00003.html
+\newsavebox{\ximagebox}\newlength{\ximageheight}
+\newsavebox{\xglyphbox}\newlength{\xglyphheight}
+\newcommand{\xbox}[1]
+{\savebox{\ximagebox}{#1}\settoheight{\ximageheight}{\usebox {\ximagebox}}%
+\savebox{\xglyphbox}{\char32}\settoheight{\xglyphheight}{\usebox {\xglyphbox}}%
+\raisebox{\ximageheight}[0pt][0pt]{%\raisebox{-\xglyphheight}[0pt] [0pt]{%
+\makebox[0pt][l]{\usebox{\xglyphbox}}}%}%
+\usebox{\ximagebox}%
+\raisebox{0pt}[0pt][0pt]{\makebox[0pt][r]{\usebox{\xglyphbox}}}}
+
+
 \renewcommand{\maketitle}{
     {
     \thispagestyle{empty}
@@ -85,18 +108,17 @@ Letters={SmallCaps,UppercaseSmallCaps}
     \color{theme}
 
     \noindent \begin{minipage}[t]{.35\textwidth}\vspace{0pt}
-        \includegraphics[width=\textwidth]{wl-logo.png}
+        \href{http://www.wolnelektury.pl}{\xbox{\includegraphics[width=\textwidth]{wl-logo.png}}}
     \end{minipage}
     \begin{minipage}[t]{.65\textwidth}\vspace{0pt}
-        \sourceinfo
+        Na podstawie: \sourceinfo
 
         \vspace{.5em}
 
-        Wejdź na stronę http://wolnelektury.pl/ i~zobacz, jak wiele możliwości daje interaktywna wersja szkolnej biblioteki
-        internetowej Wolne Lektury.
+        Wersja lektury on-line dostępna jest \href{\bookurl}{na stronie wolnelektury.pl}.
         \vspace{.5em}
 
-        Ten utwór nie jest chroniony prawem autorskim i~znajduje się w~domenie publicznej, co oznacza, że możesz go swobodnie wykorzystywać, publikować i~rozpowszechniać.
+        \rightsinfo
 
         \vspace{.6em}
 
@@ -136,7 +158,8 @@ Letters={Uppercase}
 }
 
 \newcommand{\typosection}[1]{%
-{\addfontfeature{Scale=2.0, FakeStretch=0.98, LetterSpace=-2.0}\emph{#1}}
+{\addfontfeature{FakeStretch=0.96, LetterSpace=-4.0}\emph{\scalefont{2}#1}}
+%{\addfontfeature{Scale=2.0, FakeStretch=0.98, LetterSpace=-2.0}\emph{#1}}
 }
 
 \newcommand{\nazwapodutworu}[1]{%
@@ -151,6 +174,10 @@ Letters={Uppercase}
 \section*{\typosection{#1}}%
 }
 
+\newcommand{\podtytul}[1]{%
+\subsection*{\typosubsection{#1}}%
+}
+
 \newcommand{\powiesc}[1]{#1}
 \newcommand{\opowiadanie}[1]{#1}
 \newcommand{\lirykal}[1]{#1}
@@ -299,15 +326,20 @@ Letters={Uppercase}
 }
 
 \newcommand{\sekcjaswiatlo}{%
-\hspace{30pt}%
+\vspace{30pt}%
 }
 
 \newcommand{\sekcjaasterysk}{%
+\vspace{10pt}%
+\begin{center}%
 \par{*}%
+\end{center}%
 }
 
 \newcommand{\separatorlinia}{%
+\vspace{10pt}%
 \hrule{}%
+\vspace{10pt}%
 }
 
 \newcommand{\motyw}[2][0]{%