fix for new perl (redundant defined)

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

diff --git a/librarian/pdf/wl.cls b/librarian/pdf/wl.cls
index 65ec4fc..4433914 100644 (file)
--- a/librarian/pdf/wl.cls
+++ b/librarian/pdf/wl.cls
@@ -67,7 +67,8 @@
 
 \usepackage{trace}
 
 
 \usepackage{trace}
 

-\usepackage{tabularx}
+\usepackage{longtable}
+\usepackage{tabu}

 \usepackage[MeX]{polski}
 
 \usepackage[xetex]{graphicx}
 \usepackage[MeX]{polski}
 
 \usepackage[xetex]{graphicx}


@@ -90,7 +91,7 @@ BoldFont = JunicodeWL-Regular,
 BoldItalicFont = JunicodeWL-Italic,
 SmallCapsFont = JunicodeWL-Regular,
 SmallCapsFeatures = {Letters={SmallCaps,UppercaseSmallCaps}},
 BoldItalicFont = JunicodeWL-Italic,
 SmallCapsFont = JunicodeWL-Regular,
 SmallCapsFeatures = {Letters={SmallCaps,UppercaseSmallCaps}},

-Numbers=OldStyle,
+%Numbers=OldStyle,

 Scale=1.04,
 LetterSpace=-1.0
 ] {JunicodeWL}
 Scale=1.04,
 LetterSpace=-1.0
 ] {JunicodeWL}


@@ -142,7 +143,9 @@ Letters={SmallCaps,UppercaseSmallCaps}
 
 \setlength{\marginparsep}{2em}
 \setlength{\marginparwidth}{8.5em}
 
 \setlength{\marginparsep}{2em}
 \setlength{\marginparwidth}{8.5em}

-\setlength{\oddsidemargin}{0pt}
+%\setlength{\oddsidemargin}{0pt}
+\setlength{\oddsidemargin}{\evensidemargin}
+\setlength{\evensidemargin}{18pt}

 \setlength{\voffset}{0pt}
 \setlength{\topmargin}{0pt}
 \setlength{\headheight}{0pt}
 \setlength{\voffset}{0pt}
 \setlength{\topmargin}{0pt}
 \setlength{\headheight}{0pt}


@@ -153,12 +156,14 @@ Letters={SmallCaps,UppercaseSmallCaps}
 \fancyhf{}
 \renewcommand{\headrulewidth}{0pt}
 \renewcommand{\footrulewidth}{0pt}
 \fancyhf{}
 \renewcommand{\headrulewidth}{0pt}
 \renewcommand{\footrulewidth}{0pt}

-% CAUTION! Manually entered text.

 %\lfoot{{\footnotesize \textsc{\@author} \emph{\@title}}}
 %\lfoot{{\footnotesize \textsc{\@author} \emph{\@title}}}

-\rfoot[{\footnotesize \thepage}]{{\footnotesize \textsc{\@author} \emph{Dlaczego nie warto blokować użycia komercyjnego\ldots}}}
+%\rfoot[{\footnotesize \thepage}]{{\footnotesize \textsc{\@author} \emph{\@title}}}
+\lfoot[{\footnotesize \thepage}]{}

 \cfoot{}
 %\rfoot{{\footnotesize \thepage}}
 \cfoot{}
 %\rfoot{{\footnotesize \thepage}}

-\lfoot[{\footnotesize \textsc{\@author} \emph{Dlaczego nie warto blokować użycia komercyjnego\ldots}}]{{\footnotesize \thepage}}
+%\lfoot[{\footnotesize \textsc{\@author} \emph{\@title}}]{{\footnotesize \thepage}}
+\rfoot[]{{\footnotesize \thepage}}
+

 
 \clubpenalty=100000
 \widowpenalty=100000
 
 \clubpenalty=100000
 \widowpenalty=100000


@@ -206,18 +211,20 @@ Letters={SmallCaps,UppercaseSmallCaps}
 
 \renewcommand{\maketitle}{
     {
 
 \renewcommand{\maketitle}{
     {

-    \thispagestyle{empty}
+    % \thispagestyle{empty}
+    \setcounter{page}{1}
+

     \footnotesize
     \color{theme}
 
     \noindent \begin{minipage}[t]{.65\textwidth}\vspace{0pt}
         %\href{http://prawokultury.pl}{\xbox{\includegraphics[width=1in]{prawokultury-logo.png}}}
     \footnotesize
     \color{theme}
 
     \noindent \begin{minipage}[t]{.65\textwidth}\vspace{0pt}
         %\href{http://prawokultury.pl}{\xbox{\includegraphics[width=1in]{prawokultury-logo.png}}}

-        \href{http://koed.org.pl}{\xbox{\includegraphics[height=.55in]{koedlogo.png}}}
+        \href{http://koed.org.pl}{\xbox{\includegraphics[height=.55in]{koed-logo.eps}}}

     \end{minipage}
     \noindent \begin{minipage}[t]{.35\textwidth}\vspace{0pt}
         \raggedright
         %\xbox{\includegraphics[width=1.6in]{trust-logo.eps}}
     \end{minipage}
     \noindent \begin{minipage}[t]{.35\textwidth}\vspace{0pt}
         \raggedright
         %\xbox{\includegraphics[width=1.6in]{trust-logo.eps}}

-        \href{http://nowoczesnapolska.org.pl}{\xbox{\includegraphics[height=.55in]{nowoczesnapolska.org.pl.png}}}
+        \href{http://nowoczesnapolska.org.pl}{\xbox{\includegraphics[height=.55in]{fnp-logo.eps}}}

         \vspace{.5em}
     \end{minipage}
 
         \vspace{.5em}
     \end{minipage}
 


@@ -343,9 +350,78 @@ Letters={Uppercase}
 \end{em}%
 }
 
 \end{em}%
 }
 

+\newlength{\fboxhsep}
+\newlength{\fboxvsep}
+
+\newlength{\fboxtoprule}
+\newlength{\fboxbottomrule}
+\newlength{\fboxleftrule}
+\newlength{\fboxrightrule}
+
+\setlength{\fboxhsep}{5\fboxsep}
+\setlength{\fboxvsep}{20\fboxsep}
+
+\setlength{\fboxtoprule}{\fboxrule}
+\setlength{\fboxleftrule}{\fboxrule}
+\setlength{\fboxrightrule}{\fboxrule}
+\setlength{\fboxbottomrule}{\fboxrule}
+
+
+
+\def\@frameb@xother#1{%
+  \@tempdima\fboxtoprule
+  \advance\@tempdima\fboxvsep
+  \advance\@tempdima\dp\@tempboxa
+  \hbox{%
+    \lower\@tempdima\hbox{%
+      \vbox{%
+        \hrule\@height\fboxtoprule
+        \hbox{%
+          \vrule\@width\fboxleftrule
+          #1%
+          \vbox{%
+            \vskip\fboxvsep
+            \box\@tempboxa
+            \vskip\fboxvsep}%
+          #1%
+          \vrule\@width\fboxrightrule}%
+        \hrule\@height\fboxbottomrule}%
+    }%
+  }%
+}
+
+
+\long\def\fboxother#1{%
+  \leavevmode
+  \setbox\@tempboxa\hbox{%
+    \color@begingroup
+    \kern\fboxhsep{#1}\kern\fboxhsep
+    \color@endgroup}%
+  \@frameb@xother\relax}
+
+\newcommand{\myfbox}[3]{%
+  \begingroup
+  \setlength{\fboxhsep}{#1}
+  \setlength{\fboxvsep}{#2}
+  \fboxother{#3}
+
+  \endgroup
+}
+
+\newcommand{\ramka}[1]{%
+\par\vspace{1em}%
+\edef\myindent{\the\parindent}%
+\noindent\myfbox{1em}{1em}{%
+\parbox{\dimexpr \textwidth - 2\fboxhsep - 2\fboxrule\relax}{%
+\setlength{\parindent}{\myindent}%
+#1%
+}}%
+\vspace{1em}%
+}
+

 \newcommand{\dlugicytat}[1]{%
 \begin{quotation}%
 \newcommand{\dlugicytat}[1]{%
 \begin{quotation}%

-\raggedright%
+%\raggedright%

 #1%
 \end{quotation}%
 }
 #1%
 \end{quotation}%
 }


@@ -364,7 +440,8 @@ Letters={Uppercase}
 \par{#1}%
 \begin{itemize}%
 #2%
 \par{#1}%
 \begin{itemize}%
 #2%

-\end{itemize}%
+\end{itemize}
+

 }
 
 \newcommand{\nagloweklisty}[1]{%
 }
 
 \newcommand{\nagloweklisty}[1]{%


@@ -380,11 +457,11 @@ Letters={Uppercase}
 }
 
 \newcommand{\naglowekakt}[1]{%
 }
 
 \newcommand{\naglowekakt}[1]{%

-\pagebreak
+\newpage

 \subsection*{\typosubsection{#1}}%
 }
 \newcommand{\naglowekczesc}[1]{%
 \subsection*{\typosubsection{#1}}%
 }
 \newcommand{\naglowekczesc}[1]{%

-\pagebreak
+\newpage

 \subsection*{\typosubsection{#1}}%
 }
 \newcommand{\srodtytul}[1]{%
 \subsection*{\typosubsection{#1}}%
 }
 \newcommand{\srodtytul}[1]{%


@@ -450,7 +527,8 @@ Letters={Uppercase}
 }
 
 \ifshowfootnotes
 }
 
 \ifshowfootnotes

-  \newcommand{\pa}[1]{\NoCaseChange{\footnote{#1 [przypis autorski]}}}
+  %\newcommand{\pa}[1]{\NoCaseChange{\footnote{#1 [przypis autorski]}}}
+  \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{\pe}[1]{\NoCaseChange{\footnote{#1}}}
   \newcommand{\pr}[1]{\NoCaseChange{\footnote{#1}}}
   \newcommand{\pt}[1]{\NoCaseChange{\footnote{#1}}}


@@ -530,6 +608,6 @@ Letters={Uppercase}
 }
 \newcommand{\ilustr}[2]{%
 \vspace{1em}%
 }
 \newcommand{\ilustr}[2]{%
 \vspace{1em}%

-\par{\noindent\includegraphics[width=\textwidth]{#1}}%
-\vspace{1em}%
+\par{\noindent\includegraphics[width=\linewidth]{#1}}%
+\vspace{1em}

 }
 }