podstawowa struktura trójkolumnowa tekstu.
[librarian.git] / librarian / pdf / fnprep.cls
1 % -*- coding: utf-8 -*-
2 \NeedsTeXFormat{LaTeX2e}
3 \ProvidesClass{fnprep}[2011/11/28 Modern Poland Foundation Report style]
4
5
6 %\RequirePackage{geometry}
7 \RequirePackage{setspace}
8 \RequirePackage{type1cm}
9 \RequirePackage{amssymb}
10 \RequirePackage{amsmath}
11 \RequirePackage{paralist}
12 \RequirePackage[normalem]{ulem}
13 \RequirePackage{xifthen}
14 \RequirePackage{environ} % environments with \BODY, for wyimek
15
16
17 \DeclareOption*{\PassOptionsToClass{\CurrentOption}{report}}
18 \ProcessOptions\relax
19 \LoadClass{report}
20 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
21
22 \usepackage{multicol}
23 \usepackage[landscape]{geometry}
24 \usepackage[explicit]{titlesec}
25 \usepackage{titletoc}
26 \usepackage{fancyhdr}
27 \usepackage[MeX]{polski}
28
29 \usepackage{trace}
30 \usepackage{caption}
31 \usepackage{tabularx}
32 \usepackage{icomma}
33 \usepackage[xetex]{graphicx}
34 \usepackage[silent]{fontspec} % silent - no warnings, quiet - warn only to log
35 \usepackage{xunicode}
36 \usepackage{xltxtra}
37 %\usepackage{trimspaces} % imported by something else?
38 \usepackage{xcolor}
39 \usepackage[overload]{textcase}
40 \usepackage{scalefnt}
41 \usepackage[colorlinks=false,linkcolor=white,pdfborder={0,0,0},setpagesize=false,urlcolor=black,xetex,linktocpage]{hyperref}
42 %\usepackage{hyperref}
43 \usepackage{endnotes}
44 %\usepackage{fnpos}
45 \usepackage{printlen}
46 \usepackage{calc}
47 \usepackage[stable]{footmisc}
48
49 %http://tex.stackexchange.com/questions/40510/set-first-paragraph-no-indentation-after-re-definition-of-section#40512
50
51 \usepackage{chngcntr}
52 \counterwithout{footnote}{chapter}
53 \usepackage{microtype}
54
55
56 %%% Hyphenation opts:
57 %\pretolerance=10000
58 \tolerance=2600
59 \emergencystretch=30pt
60
61
62
63
64 %%%%%%%%%%%%%%%%%%%%%%% Paper size
65 %\setlength\baselineskip{7.14pt}
66 %% \ifcutafivepaper
67 %%   \usepackage[%
68 %%     paperwidth=160mm,%
69 %%     paperheight=225mm,%
70 %%     text={117mm,162mm},%
71 %%     top=30mm,%
72 %%     headsep=8mm,%
73 %%     left=23mm,%
74 %%     right=30mm]{geometry}%
75 %% \else
76 %%   \usepackage[%
77 %%     top=\dimexpr14.5mm+\baselineskip-16pt\relax, % margin will be smaller to accomodate for bigger header (16pt)
78 %%     headsep=3\baselineskip,
79 %%     headheight=16pt,
80 %%     bottom=26.3mm,%
81 %%     inner=14.5mm,%
82 %%     outer=22.5mm,%
83 %%     textheight=\dimexpr7.14pt*(32*2+1)\relax,%
84 %%     includehead]{geometry}
85 %% \fi
86
87 %%%%%%%%%%%%%%%%%%%%%%%% Fonts
88
89 \setmainfont[
90 ItalicFont = Lato-Italic,
91 BoldFont = Lato-Bold,
92 BoldItalicFont = Lato-BoldItalic,
93 Ligatures={Common, Contextual},
94 SmallCapsFont = Lato-Regular,
95 SmallCapsFeatures={Letters=SmallCaps},
96 Mapping=tex-text
97 ]{Lato-Regular}
98 \newfontface\headfont{LeagueGothic-Regular}
99
100
101 \setlength{\parindent}{3mm}
102 \setlength{\parskip}{0mm}
103
104 % \normalsize – normalny tekst 
105 % \large - normalny tekst headingowy (nie wiem czy jest inny niz normalsize?)
106 % \Large - troche większy tekst headingowy (spis treści)
107 % \huge - pagina tytuł rozdziału
108 % \Huge - naglowek na szarym tle
109
110 %% \renewcommand{\normalsize}{\fontsize{10.4}{14.28}\addfontfeature{LetterSpace=3.0}\selectfont}
111 %% \renewcommand{\large}{\fontsize{14}{14.28}\addfontfeature{LetterSpace=3.0,Letters=Uppercase}\selectfont} % srodtytul
112 %% \renewcommand{\small}{\fontsize{8}{14.28}\addfontfeature{LetterSpace=5.0}\selectfont} % paginy
113 %% \renewcommand{\Large}{\fontsize{15}{21.42}\addfontfeature{LetterSpace=0.0}\selectfont} % tytuł rozdziału
114 %% \renewcommand{\huge}{\fontsize{18}{28.56}\addfontfeature{LetterSpace=1.0}\selectfont} % wyimek
115 %% \renewcommand{\Huge}{\fontsize{24}{40}\selectfont} % cover
116 %% \renewcommand{\footnotesize}{\addfontfeature{LetterSpace=1.0}\fontsize{9}{10.74}\selectfont}
117
118
119
120 % • • • • • • • • • COLORS • •
121 \definecolor{stoK}{cmyk}{0,0,0,1}
122 \definecolor{theme}{gray}{.3}
123 \definecolor{headcolor}{HTML}{EA5F21}
124 \definecolor{graybg}{HTML}{737372}
125 %\color{stoK}
126
127 % • • • • • • • • METADATA • •
128
129 \makeatletter
130 \newcommand{\@address}{}
131 \newcommand{\address}[1]{\renewcommand{\@address}{#1}}
132 \makeatother
133
134 % • • • • • • • • HEADINGS • •
135 %% this will go to \leftmark
136
137 \makeatletter
138 \pagestyle{fancy}
139 \fancyhf{}
140 \renewcommand{\chaptermark}[1]{\markboth{\MakeTextUppercase{#1}}{}}
141 % on the odd right : chapter title
142 \fancyhead[LE,RO]{{\color{headcolor}\headfont\huge\leftmark}}
143 \fancyfoot[LE,RO]{{\headfont\Large\thepage}}
144 \fancyfoot[LO]{{\headfont\normalfont\MakeTextUppercase{\@title}}}
145 \fancyfoot[RE]{{\headfont\normalfont\MakeTextUppercase{\@address}}}
146
147 \renewcommand{\headrulewidth}{0pt}
148 \renewcommand{\footrulewidth}{0pt}
149 \makeatother
150
151 %%%%%%%%%% Nagłówek pierwszej strony rozdziału
152 \makeatletter
153 \fancypagestyle{plain}{%
154 \fancyhf{}
155 \fancyfoot[LE,RO]{{\headfont\Large\thepage}}
156 \fancyfoot[LO]{{\headfont\normalfont\MakeTextUppercase{\@title}}}
157 }
158 \makeatother
159
160 % • • • • • • • • TITLES • • •
161 % no chapter numbers and no ``Rozdział'' word
162 %\renewcommand{\thechapter}{}
163 %\renewcommand{\chaptername}{}
164
165 % • chapter • • • • • • • • • •
166 \makeatletter\newenvironment{chaptertitlebox}{   \begin{lrbox}{\@tempboxa}\begin{minipage}[t][\dimexpr\textheight-0.5cm\relax]{\dimexpr\linewidth-0.5\columnsep\relax}}{\end{minipage}\end{lrbox}%
167    \colorbox{graybg}{\raisebox{1cm}{\usebox{\@tempboxa}}}
168 }
169
170 \newcommand{\nochapternumbers}{
171   \renewcommand{\thesection}{\@arabic \c@section .}
172 }
173 \makeatother
174
175 \nochapternumbers
176 \startcontents[chapter]
177 \titleformat{\chapter}[block]%
178 {\begin{chaptertitlebox}}%
179 {}{0pt}%
180 {\Huge{}\headfont\color{white}#1%
181 \newline\printcontents[chapter]{}{1}{}%
182 }%
183 [\end{chaptertitlebox}]
184
185 \titlespacing*{\chapter}{0pt}{0pt}{0pt}
186
187
188 % • section • • • • • • • • • • • • • • • 
189 \titleformat{\section}[runin]%
190 {\large\headfont%\nochapternumbers
191 }%
192 {}{0pt}{\makebox[\linewidth][l]{\color{headcolor}\raggedright{}\thesection
193     #1}%
194 % this is just to make the spacing between section and following
195 % text right (newlines produce strange amount of space
196 \\\makebox[\linewidth][l]{~}}%
197
198 \titlecontents{section}[0pt]{\headfont\large\color{white}}%
199 {\thecontentslabel}{\contentsmargin{0pt}}%
200 {\hfill\color{white}{\thecontentspage }}
201
202
203 % \fboxsep=0pt % for framebox
204 % ramki wkokół elementów \fbox{}
205 %\titlespacing*{\section}{0pt}{0pt}{2\baselineskip}
206
207
208 %% \titleformat{\chapter}[block]%
209 %% {\Large\intro\addfontfeature{LetterSpace=0.5,Kerning={Uppercase}}}%
210 %% {}{0pt}{\parbox{80mm}{\raggedright#1}}
211 %% \newlength{\chapterposcorrection}\newlength{\chapterspaceafter}
212 %% \setlength{\chapterposcorrection}{-\headsep-2\baselineskip-2.352mm} % 2.352 is a measured correction:
213 %% \setlength{\chapterspaceafter}{14\baselineskip-14pt+2.352mm}%\f@size of large
214 %% \titlespacing*{\chapter}{0pt}{\chapterposcorrection}{\chapterspaceafter}
215
216 %% %% Sections
217 %% \titleformat{\section}%
218 %% {\addfontfeature{LetterSpace=0.3}\large}%
219 %% {\thesection{}.}{.5em}{\MakeTextUppercase{#1}}
220 %% \renewcommand{\thesection}{\Roman{section}}
221 %% \titlespacing*{\section}{0pt}{\baselineskip}{0em}
222
223 %% \titleformat{\subsection}[block]%
224 %% {}%
225 %% {\thesubsection{}.}{.5em}{\MakeTextUppercase{#1}.}[]
226
227 %% \renewcommand{\thesubsection}{\Alph{subsection}}
228 %% \titlespacing*{\subsection}{0pt}{\baselineskip}{0em}
229
230 %% \newcommand{\typosubsubsection}[1]{%
231 %% {\textsc{#1}}
232 %% }
233
234
235 %%%%% Footnotes (works with footmisc) %%%%%%%%
236 \newlength{\footnoteindent}\newlength{\footnoteprespace}
237 \setlength{\footnoteindent}{8mm}%{3.5mm}
238 \setlength{\footnoteprespace}{0em}
239 \makeatletter
240
241 \renewcommand\@makefnmark{%
242 \hspace{\footnoteprespace}
243 \hbox{{\normalfont \@thefnmark}}%
244 }
245 \renewcommand\thefootnote{[\arabic{footnote}]}
246
247 \setlength{\footnotemargin}{-\footnoteindent-\footnoteprespace-.3em}
248 \renewcommand\footnotelayout[1]{%
249   \setlength{\leftskip}{\footnoteindent}#1}
250
251 %% \long\def\@makefntext#1{%
252 %% \setlength{\leftskip}{\footnoteindent}%
253 %% \setlength{\hskip}{-\footnoteindent-\footnoteprespace-.1em}%
254 %% \hb@xt@ \dimexpr\footnoteindent+\footnoteprespace%
255 %% {\@makefnmark}#1
256 %% %  \parindent 1em\noindent \hb@xt@ 1.8em{\hss \@makefnmark \enskip}#1
257 %% }
258
259 %%%%% Endnotes
260 \newlength{\myendnoteprespace}\setlength{\myendnoteprespace}{.5em}
261 \newlength{\myendnoteindent}\setlength{\myendnoteindent}{14mm+.5em}
262
263 \renewcommand\theendnote{[\roman{endnote}]}
264 \renewcommand\makeenmark{\hspace{\myendnoteprespace}\theenmark}
265 \renewcommand{\notesname}{}
266 \newcommand{\authornotes}{
267 %  \newpage
268     \cleardoublepage
269     \chapter{Przypisy autora}
270     \setlength{\parindent}{0pt}
271     \def\enotesize{\normalsize}
272     \theendnotes
273 }
274 %% \newcommand{\@makeentext}[1]{%
275 %% \noindent\theenmark\hspace{\footnoteindent}#1
276 %% }
277
278 %% \def\enoteformat{\rightskip\z@ \parindent=0em
279 %%  \makebox[\myendnoteindent][l]{\makeenmark}} % 12.4mm - measured biggest endnote marker (in Moglen text [xxxviii])
280 \def\enoteformat{\rightskip\z@ \setlength{\leftskip}{\myendnoteindent-\myendnoteprespace} \parindent=0em
281   \leavevmode\llap{\makebox[\myendnoteindent][l]{\makeenmark}}}
282
283
284 % make public
285 \def\trimspace#1{\trim@spaces{#1}}
286
287 \makeatother
288
289 %%%%%%%%%%%%%%%%%%%%%% Wyimki
290 %% \floatstyle{plain}
291 %% \newfloat{wyimekbox}{p}{wmk}
292 %% \floatname{wyimekbox}{Wyimek}
293
294 \NewEnviron{wyimek}{%
295   \checkoddpage
296   \ifoddpage
297     \PackageWarning{wlpub}{Wyimek on odd page, omitting it ( \BODY )}
298   \else
299     \begin{figure}[tp]
300       \begin{center}
301         \begin{minipage}[t][\textheight][c]{70mm}
302           \huge\it\BODY
303         \end{minipage}
304       \end{center}
305     \end{figure}
306   \fi
307   \BODY
308 }
309
310 %% wyimek that doesn't leave text in text flow
311 %% TODO: reduce code duplication
312 \NewEnviron{wyimekextra}{%
313   \checkoddpage
314   \ifoddpage
315     \PackageWarning{wlpub}{Wyimek on odd page, omitting it ( \BODY )}
316   \else
317     \begin{figure}[tp]
318       \begin{center}
319         \begin{minipage}[t][\textheight][c]{70mm}
320           \huge\it\BODY
321         \end{minipage}
322       \end{center}
323     \end{figure}
324   \fi
325 }
326
327
328
329
330 %%%%%%%%%%%%%%%%%%%%%%%%%%
331
332
333 \clubpenalty=700
334 \widowpenalty=700
335 \hyphenpenalty=3500
336 \doublehyphendemerits=9000
337 \finalhyphendemerits=6000
338
339
340 % see http://osdir.com/ml/tex.xetex/2005-10/msg00003.html
341 \newsavebox{\ximagebox}\newlength{\ximageheight}
342 \newsavebox{\xglyphbox}\newlength{\xglyphheight}
343 \newcommand{\xbox}[1]
344 {\savebox{\ximagebox}{#1}\settoheight{\ximageheight}{\usebox {\ximapgebox}}%
345 \savebox{\xglyphbox}{\char32}\settoheight{\xglyphheight}{\usebox {\xglyphbox}}%
346 \raisebox{\ximageheight}[0pt][0pt]{%\raisebox{-\xglyphheight}[0pt] [0pt]{%
347 \makebox[0pt][l]{\usebox{\xglyphbox}}}%}%
348 \usebox{\ximagebox}%
349 \raisebox{0pt}[0pt][0pt]{\makebox[0pt][r]{\usebox{\xglyphbox}}}}
350
351
352 \newcommand{\makecover}{
353   %% \paperwidth=297mm
354
355
356   %% \paperheight=210mm
357
358   \newgeometry{paperwidth=297mm,paperheight=210mm}
359   \pdfpageheight=210mm
360   \pdfpagewidth=297mm
361
362   \thispagestyle{empty}
363   \newlength{\PictHOffset}
364   \newlength{\PictVOffset}
365   \setlength{\PictHOffset}{1in}
366   \addtolength{\PictHOffset}{\hoffset}
367   \addtolength{\PictHOffset}{\oddsidemargin}
368
369   \setlength{\PictVOffset}{1in}
370   \addtolength{\PictVOffset}{\voffset}
371   \addtolength{\PictVOffset}{\topmargin}
372   \addtolength{\PictVOffset}{\headheight}
373   \addtolength{\PictVOffset}{\headsep}
374   \addtolength{\PictVOffset}{\topskip}
375
376   \addtolength{\PictVOffset}{-\paperheight}
377
378   \noindent\hspace*{-\PictHOffset}%
379   \raisebox{\PictVOffset}[0pt][0pt]{\makebox[0pt][l]{%
380       \includegraphics[height=\pdfpageheight,width=\pdfpagewidth]{cover.pdf}}}
381
382   \restoregeometry
383   \pdfpageheight=210mm
384   \pdfpagewidth=148mm
385
386   }
387
388 \renewcommand{\maketitle}{
389   %\vspace{\paperheight}
390   \thispagestyle{empty}
391   \cleardoublepage
392   \setcounter{page}{1}
393   \thispagestyle{empty}
394   \begin{center}
395   \intro
396   {
397     \begin{spacing}{1.4}
398     \Huge \noindent \thetitle
399     \end{spacing}
400   }
401   \end{center}
402
403   \vspace{\baselineskip}
404
405   \begin{center}
406     \intro
407     {
408       \huge \noindent
409       \theauthor
410
411     }
412   \end{center}
413                   %\emph{\thankyou}\\
414                   %\indent\emph{You made this book possible.}
415   \vspace{7\baselineskip}
416
417   \begin{center}
418     \includegraphics[scale=.2]{logo.eps}
419   \end{center}
420
421 }
422
423
424 \newcommand{\editorialsection}{
425   \clearpage
426   \thispagestyle{empty}
427   {
428     \setlength{\parindent}{0mm}
429     \small
430   \input{editorial}
431   }
432 }
433
434 \renewcommand*\contentsname{Spis treści}
435 \newcommand{\spistresci}{
436 {
437   \intro
438   \setcounter{tocdepth}{0}
439   \tableofcontents
440   \newpage
441 }
442 }
443
444
445
446
447 \newcommand{\tytul}[1]{%
448 #1%
449 \vspace{1em}%
450 }
451
452 \newcommand{\nazwapodutworu}[1]{%
453 \section*{#1}%
454 }
455
456 \newcommand{\autorutworu}[1]{%
457 #1
458 %\subsection*{\typosubsection{#1}}%
459 }
460
461 \newcommand{\dzielonadrzedne}[1]{%
462 \subsection*{#1}%
463 }
464
465 \newcommand{\nazwautworu}[1]{%
466 \section*{#1}%
467 }
468
469 \newcommand{\podtytul}[1]{%
470 \subsection*{\typosubsubsection{#1}}%
471 }
472
473 \newcommand{\podtytulpodutworu}[1]{%
474 \subsection*{\typosubsubsection{#1}}%
475 }
476
477 \newcommand{\translator}[1]{%
478 \subsection*{\typosubsubsection{tłum. #1}}%
479 }
480 \newcommand{\translatorsline}[1]{%
481 #1
482 }
483
484 \newcommand{\powiesc}[1]{#1}
485 \newcommand{\opowiadanie}[1]{#1}
486 \newcommand{\lirykal}[1]{#1}
487 \newcommand{\lirykalp}[1]{#1}
488 \newcommand{\dramatwierszowanyl}[1]{#1}
489 \newcommand{\dramatwierszowanylp}[1]{#1}
490 \newcommand{\dramatwspolczesny}[1]{#1}
491
492
493 \newcommand{\dedykacja}[1]{%
494 \begin{em}%
495 \begin{flushright}%
496 #1%
497 \end{flushright}%
498 \end{em}%
499 }
500
501 \newcommand{\dlugicytat}[1]{%
502 \begin{quotation}%
503 \noindent{}\ignorespaces#1%
504 \end{quotation}%
505 \hspace{\parindent}
506 }
507
508 \newcommand{\poezjacyt}[1]{%
509 \begin{verse}%
510 #1%
511 \end{verse}%
512 }
513 \newcommand{\motto}[1]{%
514 \begin{em}%
515 #1%
516 \end{em}%
517 }
518 \newcommand{\listaosob}[2]{%
519 \par{#1}%
520 \begin{itemize}%
521 #2%
522 \end{itemize}%
523 }
524
525 \newcommand{\nagloweklisty}[1]{%
526 \typosubsubsection{#1}%
527 }
528
529 \newcommand{\listaosoba}[1]{%
530 \item{#1}%
531 }
532
533 \newcommand{\kwestia}[1]{%
534 \par{#1}%
535 }
536
537 \newcommand{\naglowekakt}[1]{%
538 \pagebreak
539 \subsection*{\typosubsection{#1}}%
540 }
541 \newcommand{\naglowekczesc}[1]{%
542 \pagebreak
543 \part{#1}%
544 }
545 \newcommand{\srodtytul}[1]{%
546 \subsection{#1}%
547 }
548
549 \newcommand{\naglowekscena}[1]{%
550 \subsubsection*{\typosubsubsection{#1}}%
551 }
552
553 \newcommand{\theautorrozdzialu}{}
554
555 \newcommand{\autorrozdzialu}[1]{%
556 \renewcommand{\theautorrozdzialu}{{\normalfont\normalsize\newline{}\newline{}\parbox{\textwidth}{\normalsize\it #1}}}
557 }
558
559
560 \newcommand{\naglowekrozdzial}[1]{%
561 \startcontents[chapter]
562 %
563 \chapter[#1]{\MakeUppercase{#1}\theautorrozdzialu{}}%
564 \renewcommand{\theautorrozdzialu}{}%
565 }
566
567 \newcommand{\naglowekosoba}[1]{%
568 \par{\textsc{#1}}\nopagebreak%
569 }
570 \newcommand{\naglowekpodrozdzial}[1]{%
571 \section{#1}\nopagebreak%
572 }
573
574 \newcommand{\miejsceczas}[1]{%
575 \par{\emph{#1}}%
576 }
577 \newcommand{\didaskalia}[1]{%
578 \par{\emph{#1}}%
579 }
580
581 \newcommand{\akap}[1]{%
582 #1
583
584 % newline here needed, we don't use \par cause it ignores \noindent before
585 }
586 \newcommand{\akapdialog}[1]{%
587 \par{#1}%
588 }
589 \newcommand{\akapcd}[1]{%
590 \par{#1}%
591 }
592
593 \newcommand{\mottopodpis}[1]{%
594 \begin{em}%
595 \begin{flushright}%
596 #1%
597 \end{flushright}%
598 \end{em}%
599 }
600
601 \newcommand{\strofa}[1]{%
602 #1\vspace{\baselineskip}%
603 }
604
605 \newcommand{\wers}[1]{#1}
606
607 \newcommand{\wersakap}[1]{%
608 \hspace*{1em}#1%
609 }
610 \newcommand{\werscd}[1]{%
611 \hspace*{8em}#1%
612 }
613 \newcommand{\werswciety}[2][1em]{%
614 \hspace*{#1}#2%
615 }
616
617
618 \newcommand{\mat}[1]{$#1$}
619
620 \newcommand{\didasktekst}[1]{%
621 \emph{#1}%
622 }
623 \newcommand{\slowoobce}[1]{%
624 \emph{#1}%
625 }
626 \makeatletter
627
628 \newif\ifinnota \innotafalse
629
630 \newcommand{\tytuldziela}[1]{%
631   \ifinnota
632    #1%
633   \else
634    \emph{#1}%
635   \fi
636 }
637 \makeatother
638
639 \newcommand{\wyroznienie}[1]{%
640 \emph{#1}%
641 }
642
643 \newcommand{\nota}[1]{%
644 %\sekcjaasterysk{}
645 \begin{em}%
646   \innotatrue
647 %\begin{flushleft}%
648   \noindent{}\small{}#1%
649   \innotafalse
650 %\end{flushleft}%
651 \end{em}%
652 }
653
654
655 \newcommand{\osoba}[1]{%
656 #1%
657 }
658
659 \newcommand{\sekcjaswiatlo}{%
660 \vspace{\baselineskip}%
661 }
662
663 \newcommand{\sekcjaasterysk}{%
664 \vspace{\baselineskip}%
665 \begin{center}%
666 \par{*}%
667 \end{center}%
668 }
669
670 \newcommand{\separatorlinia}{%
671 \vspace{10pt}%
672 \hrule{}%
673 \vspace{10pt}%
674 }
675
676 \newcommand{\ilustrscale}[0]{1}
677 \newcommand{\setilustrscale}[1]{\renewcomand{\ilustrscale}{#1}}
678
679 \newcommand{\ilustr}[3][]{
680   \begin{center}%
681     \ifthenelse{\isempty{#1}}%
682     {\par{\includegraphics{\trimspace{#2}}\\#3}}%
683     {\par{\includegraphics[#1]{\trimspace{#2}}\\#3}}%
684   \end{center}%
685 }
686
687
688 \newcommand{\lista}[1]{%
689 \begin{compactenum}
690 %\setlength{\parskip}{\parindent}
691 #1
692 \end{compactenum}
693 }
694
695 \newcommand{\punkt}[1]{%
696 \item #1
697 }
698 \newcommand{\link}[2]{\href{#1}{\uline{#2}\footnote{#1}}}
699
700 \newcommand{\www}[1]{{\normalfont\href{#1}{#1}}}