output escaping fix

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

diff --git a/librarian/pdf/wl.sty b/librarian/pdf/wl.sty
index 1a01509..28a23a5 100644 (file)
--- a/librarian/pdf/wl.sty
+++ b/librarian/pdf/wl.sty
@@ -9,7 +9,7 @@
 
 \usepackage[overload]{textcase}
 \usepackage{scalefnt}
 
 \usepackage[overload]{textcase}
 \usepackage{scalefnt}

-\usepackage[colorlinks=true,linkcolor=black,urlcolor=black]{hyperref}
+\usepackage[colorlinks=true,linkcolor=black,setpagesize=false,urlcolor=black,xetex]{hyperref}

 
 \setmainfont [
 %ExternalLocation,
 
 \setmainfont [
 %ExternalLocation,


@@ -24,6 +24,14 @@ Scale=1.04,
 LetterSpace=-1.0
 ] {JunicodeWL}
 
 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 },
 \defaultfontfeatures{
 SizeFeatures={
   {Size={-10}, FakeStretch=1.02, LetterSpace=2.0 },


@@ -92,6 +100,34 @@ Letters={SmallCaps,UppercaseSmallCaps}
 \usebox{\ximagebox}%
 \raisebox{0pt}[0pt][0pt]{\makebox[0pt][r]{\usebox{\xglyphbox}}}}
 
 \usebox{\ximagebox}%
 \raisebox{0pt}[0pt][0pt]{\makebox[0pt][r]{\usebox{\xglyphbox}}}}
 

+\newcommand{\makecover}[2]{
+        \pdfpagewidth=#1
+        \pdfpageheight=#2
+
+        \thispagestyle{empty}
+        \newlength{\PictHOffset}
+        \newlength{\PictVOffset}
+        \setlength{\PictHOffset}{1in}
+        \addtolength{\PictHOffset}{\hoffset}
+        \addtolength{\PictHOffset}{\oddsidemargin}
+
+        \setlength{\PictVOffset}{1in}
+        \addtolength{\PictVOffset}{\voffset}
+        \addtolength{\PictVOffset}{\topmargin}
+        \addtolength{\PictVOffset}{\headheight}
+        \addtolength{\PictVOffset}{\headsep}
+        \addtolength{\PictVOffset}{\topskip}
+        \addtolength{\PictVOffset}{-\pdfpageheight}
+
+        \noindent\hspace*{-\PictHOffset}%
+        \raisebox{\PictVOffset}[0pt][0pt]{\makebox[0pt][l]{%
+            \includegraphics[height=\pdfpageheight,width=\pdfpagewidth]{cover.png}}}
+        \clearpage
+
+        \setlength{\pdfpagewidth}{210mm}
+        \setlength{\pdfpageheight}{297mm}
+}
+

 
 \renewcommand{\maketitle}{
     {
 
 \renewcommand{\maketitle}{
     {


@@ -103,36 +139,51 @@ Letters={SmallCaps,UppercaseSmallCaps}
         \href{http://www.wolnelektury.pl}{\xbox{\includegraphics[width=\textwidth]{wl-logo.png}}}
     \end{minipage}
     \begin{minipage}[t]{.65\textwidth}\vspace{0pt}
         \href{http://www.wolnelektury.pl}{\xbox{\includegraphics[width=\textwidth]{wl-logo.png}}}
     \end{minipage}
     \begin{minipage}[t]{.65\textwidth}\vspace{0pt}

-        Na podstawie: \sourceinfo

 
 

+    \ifflaglessadvertising
+    \else
+        \href{\bookurl}{Ta lektura}, podobnie jak tysiące innych, jest dostępna on-line na stronie
+        \href{http://www.wolnelektury.pl/}{wolnelektury.pl}.

         \vspace{.5em}
         \vspace{.5em}

+    \fi

 
 

-        Wersja lektury on-line dostępna jest \href{\bookurl}{na stronie wolnelektury.pl}.
-        \vspace{.5em}
-
-        \rightsinfo
-
-        \vspace{.6em}
+    Utwór opracowany został w ramach projektu \href{http://www.wolnelektury.pl/}{Wolne Lektury}
+    przez \href{http://nowoczesnapolska.org.pl}{fundację Nowoczesna Polska}.

 
     \end{minipage}
     \noindent \rule{\linewidth}{0.4pt}
 
     \vspace{.6em}
     \color{black}
 
     \end{minipage}
     \noindent \rule{\linewidth}{0.4pt}
 
     \vspace{.6em}
     \color{black}

+    }
+}

 
 

-%    \begin{figure}[b!]
-%        \footnotesize
-%        \color{theme}
-%        \noindent \rule{\linewidth}{0.4pt}
+\newcommand{\editorialsection}{
+  \begin{figure}[b!]
+  {
+    \footnotesize
+    \color{theme}
+    \noindent \rule{\linewidth}{0.4pt}

 
 

-%        Szkolna biblioteka internetowa Wolne Lektury tworzona jest dzięki pracy Wolontariuszy, ale to osoby
-%        zatrudnione w~FNP będą musiały wymyślić, co powinno zostać napisane w~tym miejscu. Można zupełnie usunąć
-%        tę sekcję, ale autor konwertera chciał się popisać, że umie coś takiego zrobić.
-%        \color{black}
-%    \end{figure}
-    }
+    \rightsinfo
+    \vspace{.6em}
+
+    Źródło: \href{\bookurl}{\bookurl}
+
+    \vspace{.6em}
+    \sourceinfo
+
+    \description
+    \vspace{.6em}
+
+    \editors
+
+    \color{black}
+  }
+  \end{figure}

 }
 
 }
 

+

 \newcommand{\typosubsubsection}[1]{%
 {\textsc{#1}}
 }
 \newcommand{\typosubsubsection}[1]{%
 {\textsc{#1}}
 }


@@ -154,6 +205,12 @@ Letters={Uppercase}
 %{\addfontfeature{Scale=2.0, FakeStretch=0.98, LetterSpace=-2.0}\emph{#1}}
 }
 
 %{\addfontfeature{Scale=2.0, FakeStretch=0.98, LetterSpace=-2.0}\emph{#1}}
 }
 

+
+\newcommand{\tytul}[1]{%
+#1%
+\vspace{1em}%
+}
+

 \newcommand{\nazwapodutworu}[1]{%
 \section*{\typosection{#1}}%
 }
 \newcommand{\nazwapodutworu}[1]{%
 \section*{\typosection{#1}}%
 }


@@ -162,10 +219,23 @@ Letters={Uppercase}
 \subsection*{\typosubsection{#1}}%
 }
 
 \subsection*{\typosubsection{#1}}%
 }
 

+\newcommand{\dzielonadrzedne}[1]{%
+\subsection*{\typosubsubsection{#1}}%
+}
+

 \newcommand{\nazwautworu}[1]{%
 \section*{\typosection{#1}}%
 }
 
 \newcommand{\nazwautworu}[1]{%
 \section*{\typosection{#1}}%
 }
 

+\newcommand{\podtytul}[1]{%
+\subsection*{\typosubsubsection{#1}}%
+}
+
+\newcommand{\translator}[1]{%
+\subsection*{\typosubsubsection{tłum. #1}}%
+}
+
+

 \newcommand{\powiesc}[1]{#1}
 \newcommand{\opowiadanie}[1]{#1}
 \newcommand{\lirykal}[1]{#1}
 \newcommand{\powiesc}[1]{#1}
 \newcommand{\opowiadanie}[1]{#1}
 \newcommand{\lirykal}[1]{#1}


@@ -289,7 +359,7 @@ Letters={Uppercase}
 }
 
 
 }
 
 

-\newcommand{\pa}[1]{\NoCaseChange{\footnote{#1}}}
+\newcommand{\pa}[1]{\NoCaseChange{\footnote{#1 [przypis autorski]}}}

 \newcommand{\pe}[1]{\NoCaseChange{\footnote{#1}}}
 \newcommand{\pr}[1]{\NoCaseChange{\footnote{#1}}}
 \newcommand{\pt}[1]{\NoCaseChange{\footnote{#1}}}
 \newcommand{\pe}[1]{\NoCaseChange{\footnote{#1}}}
 \newcommand{\pr}[1]{\NoCaseChange{\footnote{#1}}}
 \newcommand{\pt}[1]{\NoCaseChange{\footnote{#1}}}


@@ -314,15 +384,20 @@ Letters={Uppercase}
 }
 
 \newcommand{\sekcjaswiatlo}{%
 }
 
 \newcommand{\sekcjaswiatlo}{%

-\hspace{30pt}%
+\vspace{30pt}%

 }
 
 \newcommand{\sekcjaasterysk}{%
 }
 
 \newcommand{\sekcjaasterysk}{%

+\vspace{10pt}%
+\begin{center}%

 \par{*}%
 \par{*}%

+\end{center}%

 }
 
 \newcommand{\separatorlinia}{%
 }
 
 \newcommand{\separatorlinia}{%

+\vspace{10pt}%

 \hrule{}%
 \hrule{}%

+\vspace{10pt}%

 }
 
 \newcommand{\motyw}[2][0]{%
 }
 
 \newcommand{\motyw}[2][0]{%