pdf typography

diff --git a/librarian/pdf/JunicodeWL-Italic.ttf b/librarian/pdf/JunicodeWL-Italic.ttf
new file mode 100644 (file)
index 0000000..f380498
Binary files /dev/null and b/librarian/pdf/JunicodeWL-Italic.ttf differ

diff --git a/librarian/pdf/JunicodeWL-Regular.ttf b/librarian/pdf/JunicodeWL-Regular.ttf
new file mode 100644 (file)
index 0000000..24afcdc
Binary files /dev/null and b/librarian/pdf/JunicodeWL-Regular.ttf differ

diff --git a/librarian/pdf/wl.sty b/librarian/pdf/wl.sty
index 4ba84f7..6bdc2ff 100644 (file)
--- a/librarian/pdf/wl.sty
+++ b/librarian/pdf/wl.sty
@@ -1,10 +1,48 @@
-\usepackage[MeX]{polski}
+% -*- coding: utf-8 -*-
 
+\usepackage[MeX]{polski}
 
 \usepackage[xetex]{graphicx}
-\usepackage{xltxtra}
+\usepackage{fontspec}
 \usepackage{xunicode}
+\usepackage{xltxtra}
 
+\setmainfont [
+ExternalLocation,
+UprightFont = JunicodeWL-Regular.ttf,
+ItalicFont = JunicodeWL-Italic.ttf,
+BoldFont = JunicodeWL-Regular.ttf,
+BoldItalicFont = JunicodeWL-Italic.ttf,
+SmallCapsFont = JunicodeWL-Regular.ttf,
+SmallCapsFeatures = {Letters={SmallCaps,UppercaseSmallCaps}},
+Numbers=OldStyle,
+Scale=1.04,
+LetterSpace=-1.0
+] {JunicodeWL}
+
+\defaultfontfeatures{
+SizeFeatures={
+  {Size={-10}, FakeStretch=1.02, LetterSpace=2.0 },
+  {Size={10.5-12}, FakeStretch=2.00, LetterSpace=0.0 },
+  {Size={12-}, FakeStretch=0.98, LetterSpace=-2.0 }
+}
+}
+
+\renewcommand{\textsc}[1]{
+{\addfontfeature{
+SizeFeatures={
+  {Size={-10}, Scale=1.2, FakeStretch=1.02, LetterSpace=8.0 },
+  {Size={10.5-12}, Scale=1.2, FakeStretch=1.02, LetterSpace=8.0 },
+  {Size={12-}, FakeStretch=1.0, LetterSpace=8.0 }
+},
+Letters={SmallCaps,UppercaseSmallCaps}
+}
+#1}
+}
+
+%{\itshape JunicodeWL-Italic.ttf }
+%{\bfseries Junicode-Bold.ttf }
+%{\bfseries\itshape Junicode-BoldItalic.ttf }
 
 \pagestyle{plain}
 \usepackage{fancyhdr}
@@ -30,8 +68,8 @@
 \pagestyle{fancy}
 \fancyhf{}
 \renewcommand{\headrulewidth}{0pt}
-\renewcommand{\footrulewidth}{0.4pt}
-\lfoot{{\footnotesize \@author, \emph{\@title}}}
+\renewcommand{\footrulewidth}{0pt}
+\lfoot{{\footnotesize \textsc{\@author} \emph{\@title}}}
 \cfoot{}
 \rfoot{{\footnotesize \thepage}}
 
@@ -79,19 +117,36 @@
     }
 }
 
+\newcommand{\typosubsubsection}[1]{
+{\textsc{#1}}
+}
 
+\newcommand{\typosubsection}[1]{
+{\addfontfeature{
+SizeFeatures={
+  {Size={-10}, Scale=1.2, FakeStretch=1.00, LetterSpace=8.0 },
+  {Size={10.5-12}, Scale=1.2, FakeStretch=1.00, LetterSpace=8.0 },
+  {Size={12-}, FakeStretch=1.0, LetterSpace=8.0 }
+},
+Letters={Uppercase}
+}
+\MakeUppercase{#1}}
+}
 
+\newcommand{\typosection}[1]{
+{\addfontfeature{Scale=2.0, FakeStretch=0.98, LetterSpace=-2.0}\emph{#1}}
+}
 
 \newcommand{\nazwapodutworu}[1]{%
-\section*{#1}%
+\section*{\typosection{#1}}%
 }
 
 \newcommand{\autorutworu}[1]{%
-\subsection*{#1}%
+\subsection*{\typosubsection{#1}}%
 }
 
 \newcommand{\nazwautworu}[1]{%
-\section*{#1}%
+\section*{\typosection{#1}}%
 }
 
 \newcommand{\powiesc}[1]{#1}
@@ -138,7 +193,7 @@
 }
 
 \newcommand{\nagloweklisty}[1]{%
-\textbf{#1}%
+\typosubsubsection{#1}%
 }
 
 \newcommand{\listaosoba}[1]{%
@@ -150,24 +205,26 @@
 }
 
 \newcommand{\naglowekakt}[1]{%
-\subsection*{#1}%
+\pagebreak
+\subsection*{\typosubsection{#1}}%
 }
 \newcommand{\naglowekczesc}[1]{%
-\subsection*{#1}%
+\pagebreak
+\subsection*{\typosubsection{#1}}%
 }
 \newcommand{\srodtytul}[1]{%
-\subsection*{#1}%
+\subsection*{\typosubsection{#1}}%
 }
 
 \newcommand{\naglowekscena}[1]{%
-\subsubsection*{#1}%
+\subsubsection*{\typosubsubsection{#1}}%
 }
 \newcommand{\naglowekrozdzial}[1]{%
-\subsubsection*{#1}%
+\subsubsection*{\typosubsubsection{#1}}%
 }
 
 \newcommand{\naglowekosoba}[1]{%
-\par{#1}\nopagebreak%
+\par{\textsc{#1}}\nopagebreak%
 }
 \newcommand{\naglowekpodrozdzial}[1]{%
 \par{#1}\nopagebreak%
@@ -236,7 +293,7 @@
 }
 
 \newcommand{\osoba}[1]{%
-\textsc{#1}%
+#1%
 }
 
 \newcommand{\sekcjaswiatlo}{%