X-Git-Url: https://git.mdrn.pl/librarian.git/blobdiff_plain/a968d90d15f1d18dc95fc3da80d8f3220c6ddf80..1ce2c1255aee01fab9940fc26d251767bbf8c960:/librarian/pdf/wl.sty?ds=sidebyside

diff --git a/librarian/pdf/wl.sty b/librarian/pdf/wl.sty
index 6bdc2ff..687efde 100644
--- a/librarian/pdf/wl.sty
+++ b/librarian/pdf/wl.sty
@@ -7,19 +7,31 @@
 \usepackage{xunicode}
 \usepackage{xltxtra}
 
+\usepackage[overload]{textcase}
+\usepackage{scalefnt}
+\usepackage[colorlinks=true,linkcolor=black,urlcolor=black]{hyperref}
+
 \setmainfont [
-ExternalLocation,
-UprightFont = JunicodeWL-Regular.ttf,
-ItalicFont = JunicodeWL-Italic.ttf,
-BoldFont = JunicodeWL-Regular.ttf,
-BoldItalicFont = JunicodeWL-Italic.ttf,
-SmallCapsFont = JunicodeWL-Regular.ttf,
+%ExternalLocation,
+UprightFont = JunicodeWL-Regular,
+ItalicFont = JunicodeWL-Italic,
+BoldFont = JunicodeWL-Regular,
+BoldItalicFont = JunicodeWL-Italic,
+SmallCapsFont = JunicodeWL-Regular,
 SmallCapsFeatures = {Letters={SmallCaps,UppercaseSmallCaps}},
 Numbers=OldStyle,
 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 },
@@ -28,7 +40,7 @@ SizeFeatures={
 }
 }
 
-\renewcommand{\textsc}[1]{
+\renewcommand{\textsc}[1]{%
 {\addfontfeature{
 SizeFeatures={
   {Size={-10}, Scale=1.2, FakeStretch=1.02, LetterSpace=8.0 },
@@ -76,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}
@@ -83,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}
 
@@ -117,11 +141,11 @@ Letters={SmallCaps,UppercaseSmallCaps}
     }
 }
 
-\newcommand{\typosubsubsection}[1]{
+\newcommand{\typosubsubsection}[1]{%
 {\textsc{#1}}
 }
 
-\newcommand{\typosubsection}[1]{
+\newcommand{\typosubsection}[1]{%
 {\addfontfeature{
 SizeFeatures={
   {Size={-10}, Scale=1.2, FakeStretch=1.00, LetterSpace=8.0 },
@@ -133,8 +157,9 @@ Letters={Uppercase}
 \MakeUppercase{#1}}
 }
 
-\newcommand{\typosection}[1]{
-{\addfontfeature{Scale=2.0, FakeStretch=0.98, LetterSpace=-2.0}\emph{#1}}
+\newcommand{\typosection}[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]{%
@@ -149,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}
@@ -272,10 +301,10 @@ Letters={Uppercase}
 }
 
 
-\newcommand{\pa}[1]{\footnote{#1}}
-\newcommand{\pe}[1]{\footnote{#1}}
-\newcommand{\pr}[1]{\footnote{#1}}
-\newcommand{\pt}[1]{\footnote{#1}}
+\newcommand{\pa}[1]{\NoCaseChange{\footnote{#1}}}
+\newcommand{\pe}[1]{\NoCaseChange{\footnote{#1}}}
+\newcommand{\pr}[1]{\NoCaseChange{\footnote{#1}}}
+\newcommand{\pt}[1]{\NoCaseChange{\footnote{#1}}}
 
 \newcommand{\mat}[1]{$#1$}